Merge pull request #133 from mvdkleijn/betterEmptyRepoPage

Change-Id: Ic4ccf135333f49696883a3c8da99535b53403abb

8 files changed, 34 insertions, 10 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html
index bda56946..c5f9bc95 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html
@@ -31,6 +31,10 @@
 		<p></p>

 		<pre wicket:id="remoteSyntax" style="padding: 5px 30px;"></pre>

 		<p></p>

+		<span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>

+		<p></p>

+		<pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>

+		<p></p>

 		<h3>Learn Git</h3>

 		If you are unsure how to use this information, consider reviewing the <a href="http://book.git-scm.com">Git Community Book</a> or <a href="http://progit.org/book" target="_blank">Pro Git</a> for a better understanding on how to use Git.

 		<p></p>

@@ -52,4 +56,4 @@
 </div>

 </wicket:extend>	

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index 06eb72aa..00bac634 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -65,7 +65,8 @@ public class EmptyRepositoryPage extends RootPage {
 		add(new Label("repository", repositoryName));

 		add(new RepositoryUrlPanel("pushurl", false, user, repository));

 		add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", url)));

-		add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", url)));

+		add(new Label("remoteSyntax", MessageFormat.format("git remote add origin {0}\ngit push -u origin --all\ngit push -u origin --tags", url)));

+		add(new Label("upstreamSyntax", "git remote add upstream <upstream repository url>"));

 	}

 

 	@Override

diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
index 554a8d9f..7af3e31a 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
@@ -32,6 +32,9 @@
 		<span style="padding-bottom:5px;">Si ya tienes un repositorio local Git con algunas consignas, puedes a&ntilde;adir &eacute;ste como remoto y empujar desde all&iacute;.</span>

 		<p></p>

 		<pre style="padding: 5px 30px;" wicket:id="remoteSyntax"></pre>

+		<span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>

+		<p></p>

+		<pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>

 		<p></p>

 		<h3>Aprender Git</h3>

 		Si no est&aacute;s seguro de como usar esta informaci&oacute;n, &eacute;chale un vistazo al <a href="http://book.git-scm.com">Libro de la cominidad Git</a> o <a href="http://progit.org/book" target="_blank">Pro Git</a> para una mejor compresi&oacute;n de como usar Git.

diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
index 17db15d9..4027f0e3 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
@@ -31,6 +31,9 @@
 		<span style="padding-bottom:5px;">만약 커밋된 로컬 Git 저장소가 있다면, 다음과 같이 저장소에 리모트를 추가하고 푸시(push)할 수 있습니다.</span>
 		<p></p>
 		<pre style="padding: 5px 30px;" wicket:id="remoteSyntax"></pre>
+		<span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>
+		<p></p>
+		<pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
 		<p></p>
 		<h3>Git 배우기</h3>
 		만약 사용법에 자신이 없다면, Git 사용법을 더 잘 이해하기 위해 
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
index 6a491ee8..1fc3fe8d 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
@@ -7,32 +7,36 @@
 <body>

 <wicket:extend>

 <div class="container">

-	<h2>Empty Repository</h2>

+	<h2>Lege Repository</h2>

 	<p></p>

 		<div class="row">

 			<div class="span10">

 				<div class="alert alert-success">

-					<span wicket:id="repository" style="font-weight: bold;">[repository]</span> is een lege repositorie en kan niet bekeken worden door Gitblit.

+					<span wicket:id="repository" style="font-weight: bold;">[repository]</span> is een lege repository en kan niet bekeken worden door Gitblit.

 					<p></p>		

-					Push aub een paar commitsome commits naar <span wicket:id="pushurl"></span>

+					Push alstublieft een paar commits naar <span wicket:id="pushurl"></span>

 					<p></p>

 					<hr/>

-					Nadat u een paar commits gepushed hebt kunt u deze pagina <b>verversen</b> om de repository te bekijken.

+					Nadat u een commits gepushed heeft, kunt u deze pagina <b>verversen</b> om uw repository te bekijken.

 				</div>

 			</div>

 		</div>

 		

 		<h3>Git Command-Line Syntax</h3>

-		<span style="padding-bottom:5px;">Als u geen lokale Git repositorie heeft, kunt u deze repository clonen, er een paar bestanden naar committen en deze commits teug pushen naar Gitblit.</span>

+		<span style="padding-bottom:5px;">Als u geen lokale Git repository heeft, kunt u deze repository clonen, er bestanden naar committen en dan uw commits terug pushen naar Gitblit.</span>

 		<p></p>

 		<pre style="padding: 5px 30px;" wicket:id="cloneSyntax"></pre>

 		<p></p>

-		<span style="padding-bottom:5px;">Als u al een lokale Git repositorie heeft met commits kunt u deze repository als een remote toevoegen en er naar toe pushen.</span>

+		<span style="padding-bottom:5px;">Als u al een lokale Git repository met commits heeft, kunt u deze repository als een remote toevoegen en er naar pushen.</span>

 		<p></p>

 		<pre wicket:id="remoteSyntax" style="padding: 5px 30px;"></pre>

 		<p></p>

-		<h3>Learn Git</h3>

-		Als u niet goed weet wat u met deze informatie aan moet raden we aan om het <a href="http://book.git-scm.com">Git Community Book</a> of <a href="http://progit.org/book" target="_blank">Pro Git</a> te bestuderen voor een betere begrip van hoe u Git kunt gebruiken.

+		<span style="padding-bottom:5px;">Indien uw repository bedoeld is om synchroon gehouden te worden met een upstream repository, dan kunt u deze toevoegen.</span>

+		<p></p>

+		<pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>

+		<p></p>

+		<h3>Leer Git</h3>

+		Als u niet goed weet wat u met deze informatie aan moet, raden we u aan om het <a href="http://book.git-scm.com">Git Community Book</a> of <a href="http://progit.org/book" target="_blank">Pro Git</a> te bestuderen voor een beter begrip over hoe u Git kunt gebruiken.

 		<p></p>

 		<h4>Open Source Git Clients</h4>

 		<ul>

diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
index 8db2f74e..3f9db908 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
@@ -32,6 +32,9 @@
 		<span style="padding-bottom:5px;">Gdy posiadasz lokalne repozytorium GITa z dowolnymi zmianami, to mo&#380;esz doda&#263; to repozytorium jako remote i wys&#322;a&#263; do niego zmiany poprzez push.</span>
 		<p></p>
 		<pre style="padding: 5px 30px;" wicket:id="remoteSyntax"></pre>
+		<span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>
+		<p></p>
+		<pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
 		<p></p>
 		<h3>Nauka GITa</h3>
 		Je&#380;eli powy&#380;sze informacje s&#261; dla Ciebie niezrozumia&#322;e, zapoznaj si&#281; z ksi&#261;&#380;k&#261; <a href="http://git-scm.com/book/pl" target="_blank">Pro Git - Wersja PL</a> dla lepszego zrozumienia, jak poprawnie u&#380;ywa&#263; GITa.
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
index 21512c66..351fe872 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
@@ -30,6 +30,9 @@
 		<span style="padding-bottom:5px;">Se você já tem um repositório Git local com alguns commits, então você deve adicionar este repositório como uma referência remota e então fazer push.</span>

 		<p></p>

 		<pre wicket:id="remoteSyntax" style="padding: 5px 30px;"></pre>

+		<span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>

+		<p></p>

+		<pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>

 		<p></p>

 		<h3>Aprenda Git</h3>

 		Se você estiver com dúvidas sobre como ultilizar essas informações, uma sugestão seria dar uma olhada no livro <a href="http://book.git-scm.com">Git Community Book</a> ou <a href="http://progit.org/book" target="_blank">Pro Git</a> para entender melhor como usar o Git.

diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
index 6c1ba708..955b4312 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
@@ -32,6 +32,9 @@
         版本库，并进行推送。</span>
 		<p></p>
 		<pre wicket:id="remoteSyntax" style="padding: 5px 30px;"></pre>
+		<span style="padding-bottom:5px;">If your repository is meant to be kept in sync with an upstream repository, then you may add it.</span>
+		<p></p>
+		<pre wicket:id="upstreamSyntax" style="padding: 5px 30px;"></pre>
 		<p></p>
 		<h3>学习 Git</h3>
 		如果您不明白这些信息什么意思, 您可以参考 <a href="http://book.git-scm.com">Git Community Book</a> 或者 <a href="http://progit.org/book" target="_blank">Pro Git</a> 去更加深入的学习 Git 的用法。