wiki branch merged into trunk

git-svn-id: http://redmine.rubyforge.org/svn/trunk@323 e93f8b46-1217-0410-a6f0-8f06a7374b81

5 files changed, 30 insertions, 0 deletions

diff --git a/lang/de.yml b/lang/de.yml
index cb253b383..1e301456e 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -142,6 +142,7 @@ field_auth_source: Authentisierung Modus
 field_hide_mail: Mein email address verstecken

 field_comment: Anmerkung

 field_url: URL

+field_start_page: Hauptseite

 

 setting_app_title: Applikation Titel

 setting_app_subtitle: Applikation Untertitel

@@ -154,6 +155,7 @@ setting_issues_export_limit: Issues export limit
 setting_mail_from: Emission address

 setting_host_name: Host Name

 setting_text_formatting: Textformatierung

+setting_wiki_compression: Wiki Geschichte Kompression

 

 label_user: Benutzer

 label_user_plural: Benutzer

@@ -322,6 +324,10 @@ label_search: Suche
 label_result: %d Resultat

 label_result_plural: %d Resultate

 label_all_words: Alle Wörter

+label_wiki: Wiki

+label_page_index: Index

+label_current_version: Gegenwärtige Version

+label_preview: Vorbetrachtung

 

 button_login: Einloggen

 button_submit: Einreichen

diff --git a/lang/en.yml b/lang/en.yml
index 20a43e564..f369afbd8 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -142,6 +142,7 @@ field_auth_source: Authentication mode
 field_hide_mail: Hide my email address

 field_comment: Comment

 field_url: URL

+field_start_page: Start page

 

 setting_app_title: Application title

 setting_app_subtitle: Application subtitle

@@ -154,6 +155,7 @@ setting_issues_export_limit: Issues export limit
 setting_mail_from: Emission mail address

 setting_host_name: Host name

 setting_text_formatting: Text formatting

+setting_wiki_compression: Wiki history compression

 

 label_user: User

 label_user_plural: Users

@@ -322,6 +324,10 @@ label_search: Search
 label_result: %d result

 label_result_plural: %d results

 label_all_words: All words

+label_wiki: Wiki

+label_page_index: Index

+label_current_version: Current version

+label_preview: Preview

 

 button_login: Login

 button_submit: Submit

diff --git a/lang/es.yml b/lang/es.yml
index 3004470e6..0162b6bdd 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -142,6 +142,7 @@ field_auth_source: Modo de la autentificación
 field_hide_mail: Ocultar mi email address

 field_comment: Comentario

 field_url: URL

+field_start_page: Página principal

 

 setting_app_title: Título del aplicación

 setting_app_subtitle: Subtítulo del aplicación

@@ -154,6 +155,7 @@ setting_issues_export_limit: Issues export limit
 setting_mail_from: Email de la emisión

 setting_host_name: Nombre de anfitrión

 setting_text_formatting: Formato de texto

+setting_wiki_compression: Compresión de la historia de Wiki

 

 label_user: Usuario

 label_user_plural: Usuarios

@@ -322,6 +324,10 @@ label_search: Búsqueda
 label_result: %d resultado

 label_result_plural: %d resultados

 label_all_words: Todas las palabras

+label_wiki: Wiki

+label_page_index: Índice

+label_current_version: Versión actual

+label_preview: Previo

 

 button_login: Conexión

 button_submit: Someter

diff --git a/lang/fr.yml b/lang/fr.yml
index fba9cb9fb..8f629f7bb 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -142,6 +142,7 @@ field_auth_source: Mode d'authentification
 field_hide_mail: Cacher mon adresse mail

 field_comment: Commentaire

 field_url: URL

+field_start_page: Page de démarrage

 

 setting_app_title: Titre de l'application

 setting_app_subtitle: Sous-titre de l'application

@@ -154,6 +155,7 @@ setting_issues_export_limit: Limite export demandes
 setting_mail_from: Adresse d'émission

 setting_host_name: Nom d'hôte

 setting_text_formatting: Formatage du texte

+setting_wiki_compression: Compression historique wiki

 

 label_user: Utilisateur

 label_user_plural: Utilisateurs

@@ -322,6 +324,10 @@ label_search: Recherche
 label_result: %d résultat

 label_result_plural: %d résultats

 label_all_words: Tous les mots

+label_wiki: Wiki

+label_page_index: Index

+label_current_version: Version actuelle

+label_preview: Prévisualisation

 

 button_login: Connexion

 button_submit: Soumettre

diff --git a/lang/ja.yml b/lang/ja.yml
index 86dcd7f3f..be45f58a6 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -143,6 +143,7 @@ field_auth_source: 認証モード
 field_hide_mail: Emailアドレスを隠す

 field_comment: コメント

 field_url: URL

+field_start_page: メインページ

 

 setting_app_title: アプリケーションのタイトル

 setting_app_subtitle: アプリケーションのサブタイトル

@@ -155,6 +156,7 @@ setting_issues_export_limit: 出力する問題数の上限
 setting_mail_from: Emission メールアドレス

 setting_host_name: ホスト名

 setting_text_formatting: テキストの書式

+setting_wiki_compression: Wiki history compression

 

 label_user: ユーザ

 label_user_plural: ユーザ

@@ -323,6 +325,10 @@ label_search: 検索
 label_result: %d 件の結果

 label_result_plural: %d 件の結果

 label_all_words: すべての単語

+label_wiki: Wiki

+label_page_index: 索引

+label_current_version: 最近版

+label_preview: 下検分

 

 button_login: ログイン

 button_submit: 変更