Moved languagestrings to ini

Signed-off-by: Konrad <konrad@kola-entertainments.de>

options/locale/locale_en-US.ini

@@ -502,14 +502,14 @@ migrate.clone_local_path = or local server path
 migrate.permission_denied = You are not allowed to import local repositories.
 migrate.invalid_local_path = Invalid local path, it does not exist or not a directory.
 migrate.failed = Migration failed: %v
-migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git lfs fetch --all' and 'git lfs push --all' instead.
+migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git?lfs?fetch?--all' and 'git?lfs?push?--all' instead.
 
 mirror_from = mirror of
 forked_from = forked from
 fork_from_self = You cannot fork a repository you already own!
 copy_link = Copy
 copy_link_success = Copied!
-copy_link_error = Press ⌘-C or Ctrl-C to copy
+copy_link_error = Press ?-C or Ctrl-C to copy
 copied = Copied OK
 unwatch = Unwatch
 watch = Watch
@@ -729,10 +729,21 @@ issues.dependency.title = Dependencies
 issues.dependency.no_dependencies = This issue currently doesn't have any dependencies.
 issues.dependency.add = Add
 issues.dependency.cancel = Cancel
+issues.dependency.remove = Remove
 issues.dependency.add_header = Add New Dependency
 issues.dependency.issue_number = Issuenumber
 issues.dependency.added_dependency = `<a href="%[1]s">%[2]s</a> added a new dependency %[3]s`
 issues.dependency.removed_dependency = `<a href="%[1]s">%[2]s</a> removed a dependency %[3]s`
+issues.dependency.issue_closing_blockedby = Closing this pull request is blocked by
+issues.dependency.pr_closing_blockedby = Closing this issue is blocked by
+issues.dependency.issue_close_blocks = This issue blocks closing of the following issues
+issues.dependency.pr_close_blocks = This pull request blocks closing of the following issues
+issues.dependency.remove_header = Remove Dependency
+issues.dependency.remove_text = This will remove the dependency to this issue. Are you sure? You cannot undo this!
+issues.dependency.setting = Issues can have dependencies
+issues.dependency.add_error_same_issue = You cannot make an issue depend on itself!
+issues.dependency.add_error_dep_not_exist = Dependend issue does not exist!
+issues.dependency.add_error_dep_exists = Dependency already exists!
 
 
 pulls.desc = Pulls management your code review and merge requests
@@ -1281,7 +1292,7 @@ auths.tip.github = Register a new OAuth application on https://github.com/settin
 auths.tip.gitlab = Register a new application on https://gitlab.com/profile/applications
 auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console (https://console.developers.google.com/)
 auths.tip.openid_connect = Use the OpenID Connect Discovery URL (<server>/.well-known/openid-configuration) to specify the endpoints
-auths.tip.twitter = Go to https://dev.twitter.com/apps , create an application and ensure that the “Allow this application to be used to Sign in with Twitter” option is enabled.
+auths.tip.twitter = Go to https://dev.twitter.com/apps , create an application and ensure that the ?Allow this application to be used to Sign in with Twitter? option is enabled.
 auths.edit = Edit Authentication Settings
 auths.activated = This authentication is activated
 auths.new_success = The authentication '%s' has been added.

routers/repo/issue_dependency_add.go

@@ -46,7 +46,7 @@ func AddDependency(c *context.Context) {
 
 	// Check if issue and dependency is the same
 	if dep.Index == issueIndex{
-		c.Flash.Error("You cannot make an issue depend on itself!")
+		c.Flash.Error(c.Tr("issues.dependency.add_error_same_issue"))
 	} else {
 
 		err, exists, depExists := models.CreateIssueDependency(c.User, issue, dep)
@@ -56,11 +56,11 @@ func AddDependency(c *context.Context) {
 		}
 
 		if !depExists {
-			c.Flash.Error("Dependend issue does not exist!")
+			c.Flash.Error(c.Tr("add_error_dep_not_exist"))
 		}
 
 		if exists {
-			c.Flash.Error("Dependency already exists!")
+			c.Flash.Error(c.Tr("add_error_dep_exists"))
 		}
 	}
 

templates/repo/issue/view_content/sidebar.tmpl

@@ -198,7 +198,13 @@
 			<span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span>
 			<br>
 			{{if .BlockedByDependencies}}
-			<span class="text">Closing this issue is blocked by:</span>
+			<span class="text">
+				{{if .Issue.IsPull}}
+					{{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}}:
+				{{else}}
+					{{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}}:
+				{{end}}
+			</span>
 			<div class="ui relaxed divided list">
 				{{range .BlockedByDependencies}}
 				<div class="item">
@@ -225,7 +231,13 @@
 
 			{{if .BlockingDependencies}}
 			<div class="ui relaxed divided list">
-				<span class="text">This issue blocks closing of the following issues:</span>
+				<span class="text">
+					{{if .Issue.IsPull}}
+						{{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}}:
+					{{else}}
+						{{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}}:
+					{{end}}
+				</span>
 				{{range .BlockingDependencies}}
 				<div class="item">
 					<div class="right floated content">
@@ -289,7 +301,7 @@
 <div class="ui basic modal remove-dependency">
 	<div class="ui icon header">
 		<i class="trash icon"></i>
-		Remove Dependency
+		{{.i18n.Tr "repo.issues.dependency.remove_header"}}
 	</div>
 	<div class="content">
 		<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/removeDependency" id="removeDependencyForm">
@@ -297,16 +309,16 @@
 			<input type="hidden" value="" name="removeDependencyID" id="removeDependencyID"/>
 			<input type="hidden" value="" name="dependencyType" id="dependencyType"/>
 		</form>
-		<p>This will remove the dependency to this issue. Are you sure? You cannot undo this!</p>
+		<p>{{.i18n.Tr "repo.issues.dependency.remove_text"}}</p>
 	</div>
 	<div class="actions">
 		<div class="ui basic red cancel inverted button">
 			<i class="remove icon"></i>
-			Cancel
+			{{.i18n.Tr "repo.issues.dependency.cancel"}}
 		</div>
 		<div class="ui basic green ok inverted button">
 			<i class="checkmark icon"></i>
-			Delete
+			{{.i18n.Tr "repo.issues.dependency.remove"}}
 		</div>
 	</div>
 </div>

templates/repo/settings/options.tmpl

@@ -156,7 +156,7 @@
 					<div class="field">
 						<div class="ui checkbox">
 							<input name="enable_issue_dependencies" type="checkbox" {{if (.Repository.UnitEnabled $.UnitTypeIssueDependencies)}}checked{{end}}>
-							<label>Issues can have dependencies</label>
+							<label>{{.i18n.Tr "repo.settings.setting"}}</label>
 						</div>
 					</div>
 					<div class="field">