Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot…

…/moodle-install into MOODLE_31_STABLE
moodle · Jun 23, 2016 · 7f2fd69 · 7f2fd69
2 parents e9019af + 1036d07
commit 7f2fd69
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 15 deletions.
diff --git a/install/lang/da_rum/langconfig.php b/install/lang/da_rum/langconfig.php
@@ -0,0 +1,35 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'da';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Dansk Rum';
diff --git a/install/lang/de_comm/langconfig.php b/install/lang/de_comm/langconfig.php
@@ -32,4 +32,4 @@
 
 $string['parentlanguage'] = 'de_du';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'Deutsch community';
+$string['thislanguage'] = 'Deutsch (community)';
diff --git a/install/lang/de_du/langconfig.php b/install/lang/de_du/langconfig.php
@@ -32,4 +32,4 @@
 
 $string['parentlanguage'] = 'de';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'Deutsch - Du';
+$string['thislanguage'] = 'Deutsch (Du)';
diff --git a/install/lang/de_kids/langconfig.php b/install/lang/de_kids/langconfig.php
@@ -32,4 +32,4 @@
 
 $string['parentlanguage'] = 'de_du';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'Deutsch - Kids';
+$string['thislanguage'] = 'Deutsch (kids)';
diff --git a/install/lang/en_ar/langconfig.php b/install/lang/en_ar/langconfig.php
@@ -31,4 +31,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'en';
-$string['thislanguage'] = 'English - Pirate';
+$string['thislanguage'] = 'English (pirate)';
diff --git a/install/lang/en_kids/langconfig.php b/install/lang/en_kids/langconfig.php
@@ -31,4 +31,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'en';
-$string['thislanguage'] = 'English for kids';
+$string['thislanguage'] = 'English (kids)';
diff --git a/install/lang/en_us/langconfig.php b/install/lang/en_us/langconfig.php
@@ -31,4 +31,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'English - United States';
+$string['thislanguage'] = 'English (United States)';
diff --git a/install/lang/es_mx/langconfig.php b/install/lang/es_mx/langconfig.php
@@ -32,4 +32,4 @@
 
 $string['parentlanguage'] = '';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'Español - México';
+$string['thislanguage'] = 'Español (México)';
diff --git a/install/lang/es_ve/langconfig.php b/install/lang/es_ve/langconfig.php
@@ -31,4 +31,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'es';
-$string['thislanguage'] = 'Español Venezuela';
+$string['thislanguage'] = 'Español (Venezuela)';
diff --git a/install/lang/fr_ca/langconfig.php b/install/lang/fr_ca/langconfig.php
@@ -32,4 +32,4 @@
 
 $string['parentlanguage'] = 'fr';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'Français - Canada';
+$string['thislanguage'] = 'Français (Canada)';
diff --git a/install/lang/ja_kids/langconfig.php b/install/lang/ja_kids/langconfig.php
@@ -32,4 +32,4 @@
 
 $string['parentlanguage'] = 'ja';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'Japanese - kids';
+$string['thislanguage'] = 'Japanese (kids)';
diff --git a/install/lang/lt_uni/langconfig.php b/install/lang/lt_uni/langconfig.php
@@ -31,4 +31,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'lt';
-$string['thislanguage'] = 'Lithuanian (university)';
+$string['thislanguage'] = 'Lietuvių';
diff --git a/install/lang/pt/moodle.php b/install/lang/pt/moodle.php
@@ -31,7 +31,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['language'] = 'Idioma';
-$string['moodlelogo'] = 'Logotipo Moodle';
+$string['moodlelogo'] = 'Logótipo Moodle';
 $string['next'] = 'Seguinte';
 $string['previous'] = 'Anterior';
 $string['reload'] = 'Recarregar';
diff --git a/install/lang/ro/install.php b/install/lang/ro/install.php
@@ -64,5 +64,6 @@
 <p>Trebuie să upgradați PHP sau să îl mutați pe o gazdă cu o nouă versiune de PHP!<br />
 (În cazul 5.0.x puteți, de asemenea, să downgradați la versiunea 4.4.x)</p>';
 $string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
+$string['welcomep20'] = 'Vedeți această pagină deoarece ați instalat și lansat cu succes pachetul  <strong>{$a->packname} {$a->packversion}</strong> în computerul dumneavoastră. Felicitări!';
 $string['welcomep40'] = 'Pachetul include și <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
 $string['wwwroot'] = 'Adresă Web';
diff --git a/install/lang/ru/admin.php b/install/lang/ru/admin.php
@@ -42,3 +42,4 @@
 $string['cliyesnoprompt'] = 'Введите y (обозначает Да) или n (обозначает Нет)';
 $string['environmentrequireinstall'] = 'необходимо установить и включить';
 $string['environmentrequireversion'] = 'требуется версия {$a->needed}, у Вас используется версия {$a->current}';
+$string['upgradekeyset'] = 'Ключ обновления (оставьте пустым, если не хотите его задавать)';
diff --git a/install/lang/ru/moodle.php b/install/lang/ru/moodle.php
@@ -31,6 +31,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['language'] = 'Язык';
+$string['moodlelogo'] = 'Логотип Moodle';
 $string['next'] = 'Далее';
 $string['previous'] = 'Назад';
 $string['reload'] = 'Обновить';
diff --git a/install/lang/zh_tw/install.php b/install/lang/zh_tw/install.php
@@ -69,7 +69,9 @@
 $string['pathsrodataroot'] = '資料根目錄是無法寫入的';
 $string['pathsroparentdataroot'] = '上層目錄({$a->parent})是不可寫入的。安裝程式無法建立資料目錄({$a->dataroot})。';
 $string['pathssubadmindir'] = '有些網站主機使用/admin這個網址來瀏覽控制面版或其他功能。很不幸，這個設定和Moodle管理頁面的標準路徑產生衝突。這個問題可以解決，只需在您的安裝目錄中把admin更換名稱，然後把新名稱輸入到這裡。例如<em>moodleadmin</em>這麼做會改變Moodle中的管理連接。';
-$string['pathssubdataroot'] = '你需要有一個地方讓Moodle可以儲存上傳的檔案。這一目錄對於網頁伺服器用戶(通常是"nobody"或"apache")而言，應該是可讀的和<b>可寫的</b>。但是它必須不能經由網頁直接存取。若此目錄不存在，這安裝程式將會試著建立它。';
+$string['pathssubdataroot'] = '<p>你需要有一個目錄讓Moodle可以儲存所有的用戶上傳的檔案。</p><p>這目錄對於網頁伺服器用戶(通常是"www-data"、"nobody"或"apache")而言，應該是可讀的和<b>可寫的</b>。</p>
+<p>它必須是不能透過網際網路直接存取的。</p>
+<p>若此目錄目前不存在，這安裝過程將會試著建立它。</p>';
 $string['pathssubdirroot'] = '包含Moodle程式碼的目錄的完整路徑';
 $string['pathssubwwwroot'] = '可以進入使用Moodle的完整網址，也就是用戶為了要使用Moodle，而需要輸入到瀏覽器的網址列的地址。
 
@@ -87,9 +89,10 @@
 <p>您必須更新您的 PHP 或在有更新版本的主機上進行安裝！(若是5.0.x，你可以下降到4.4.x 版本)</p>';
 $string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
 $string['welcomep20'] = '這個頁面是提醒您已經成功安裝與啟動 <strong>{$a->packname} {$a->packversion}</strong> ，恭喜！';
-$string['welcomep30'] = '<strong>{$a->installername}</strong>包含了可以建立<strong>Moodle</strong>執行環境的應用程序：';
+$string['welcomep30'] = '這一<strong>{$a->installername}</strong>的版本包含了一些可以建立<strong>Moodle</strong>執行環境的應用程序：';
 $string['welcomep40'] = '這個軟體還包含了<strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>。';
 $string['welcomep50'] = '使用本軟體包所包含的所有應用程序時，應遵循它們各自的授權協議。整個<strong>{$a->installername}</strong> 軟體都是<a href="http://www.opensource.org/docs/definition_plain.html">開放原始碼</a> ，並且是在 <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> 授權協議下發佈。';
-$string['welcomep60'] = '接下來的頁面將會透過一些簡單的步驟引導您安裝 <strong>Moodle</strong> 到電腦中，您可以接受預設值，或是針對自己的需求調整修改。';
+$string['welcomep60'] = '接下來的一些頁面將會透過一些簡單的步驟引導您配置和設定在你電腦上的 <strong>Moodle</strong> 。
+您可以接受這些預設值，或是針對你自己的需要來調整。';
 $string['welcomep70'] = '點選 "下一步" 按鈕，繼續設定<strong>Moodle</strong>.';
 $string['wwwroot'] = '網站位址';