summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-01-14 08:16:17 -0500
committerJames Moger <james.moger@gitblit.com>2014-01-14 08:16:17 -0500
commitdccc927c7c2100657a8503f8d526ceec56aab288 (patch)
tree2d0288e380a2fac1f0463f03e9f4ab6db14aa039 /src/main/java
parent3a63b3f9df78556e6e17ab595e9cf6814c320519 (diff)
downloadgitblit-dccc927c7c2100657a8503f8d526ceec56aab288.tar.gz
gitblit-dccc927c7c2100657a8503f8d526ceec56aab288.zip
Fixed compile failure and updated translated empty repo pages
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java2
-rw-r--r--src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html3
-rw-r--r--src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html3
-rw-r--r--src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html3
-rw-r--r--src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html3
-rw-r--r--src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html3
6 files changed, 16 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index 331626de..00bac634 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -66,7 +66,7 @@ public class EmptyRepositoryPage extends RootPage {
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 origin {0}\ngit push -u origin --all\ngit push -u origin --tags", url)));
- add(new Label("upstreamSyntax", MessageFormat.format("git remote add upstream <upstream repository 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_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 的用法。