5 files changed, 126 insertions, 2 deletions
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index f1610c9f92b..9a4a1a94745 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -1,5 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Cannot write into \"config\" directory!" => "No es pot escriure a la carpeta \"config\"!",
+"This can usually be fixed by giving the webserver write access to the config directory" => "Això normalment es pot solucionar donant al servidor web permís d'escriptura a la carpeta de configuració",
+"See %s" => "Comproveu %s",
+"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
 "You are accessing the server from an untrusted domain." => "Esteu accedint el servidor des d'un domini no fiable",
 "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
 "Help" => "Ajuda",
@@ -86,6 +90,33 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "Heu de facilitar un nom d'usuari vàlid",
 "A valid password must be provided" => "Heu de facilitar una contrasenya vàlida",
 "The username is already being used" => "El nom d'usuari ja està en ús",
+"No database drivers (sqlite, mysql, or postgresql) installed." => "No hi ha instal·lats controladors de bases de dades (sqlite, mysql o postgresql).",
+"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
+"Cannot write into \"config\" directory" => "No es pot escriure a la carpeta \"config\"",
+"Cannot write into \"apps\" directory" => "No es pot escriure a la carpeta \"apps\"",
+"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta d'aplicacions %s o inhabilitant la botiga d'aplicacions en el fitxer de configuració.",
+"Cannot create \"data\" directory (%s)" => "No es pot crear la carpeta \"data\" (%s)",
+"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Aixó normalment es por solucionar <a href=\"%s\" target=\"_blank\">donant al servidor web permís d'accés a la carpeta arrel</a>",
+"Setting locale to %s failed" => "Ha fallat en establir la llengua a %s",
+"Please install one of theses locales on your system and restart your webserver." => "Instal·leu una d'aquestes llengües en el sistema i reinicieu el servidor web.",
+"Please ask your server administrator to install the module." => "Demaneu a l'administrador del sistema que instal·li el mòdul.",
+"PHP module %s not installed." => "El mòdul PHP %s no està instal·lat.",
+"PHP %s or higher is required." => "Es requereix PHP %s o superior.",
+"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Demaneu a l'administrador que actualitzi PHP a l'última versió. La versió que teniu instal·lada no té suport d'ownCloud ni de la comunitat PHP.",
+"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "El mode segur de PHP està activat. OwnCloud requereix que es desactivi per funcionar correctament.",
+"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "El mode segur de PHP està desfasat i és principalment inútil i hauria de desactivar-se. Demaneu a l'administrador que el desactivi a php.ini o a la configuració del servidor web.",
+"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Les Magic Quotes estan activades. OwnCloud requereix que les desactiveu per funcionar correctament.",
+"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes està desfassat i és principalment inútil i hauria de desactivar-se. Demaneu a l'administrador que el desactivi a php.ini o a la configuració del servidor web.",
+"PHP modules have been installed, but they are still listed as missing?" => "S'han instal·lat mòduls PHP, però encara es llisten com una mancança?",
+"Please ask your server administrator to restart the web server." => "Demaneu a l'administrador que reinici el servidor web.",
+"PostgreSQL >= 9 required" => "Es requereix PostgreSQL >= 9",
+"Please upgrade your database version" => "Actualitzeu la versió de la base de dades",
+"Error occurred while checking PostgreSQL version" => "Hi ha hagut un error en comprovar la versió de PostgreSQL",
+"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Assegureu-vos que teniu PostgreSQL >= 9 o comproveu els registres per més informació quant a l'error",
+"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Canvieu els permisos a 0770 per tal que la carpeta no es pugui llistar per altres usuaris.",
+"Data directory (%s) is readable by other users" => "La carpeta de dades (%s) és llegible per altres usuaris",
+"Data directory (%s) is invalid" => "La carpeta de dades (%s) no és vàlida",
+"Please check that the data directory contains a file \".ocdata\" in its root." => "Comproveu que la carpeta de dades contingui un fitxer \".ocdata\" a la seva arrel.",
 "Could not obtain lock type %d on \"%s\"." => "No s'ha pogut obtenir un bloqueig tipus %d a \"%s\"."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
index 4a7eddb1ea8..e1e485058e1 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/l10n/en_GB.php
@@ -1,5 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Cannot write into \"config\" directory!" => "Cannot write into \"config\" directory!",
+"This can usually be fixed by giving the webserver write access to the config directory" => "This can usually be fixed by giving the webserver write access to the config directory",
+"See %s" => "See %s",
+"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "This can usually be fixed by %sgiving the webserver write access to the config directory%s.",
 "You are accessing the server from an untrusted domain." => "You are accessing the server from an untrusted domain.",
 "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
 "Help" => "Help",
@@ -86,6 +90,33 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "A valid username must be provided",
 "A valid password must be provided" => "A valid password must be provided",
 "The username is already being used" => "The username is already being used",
+"No database drivers (sqlite, mysql, or postgresql) installed." => "No database drivers (sqlite, mysql, or postgresql) installed.",
+"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.",
+"Cannot write into \"config\" directory" => "Cannot write into \"config\" directory",
+"Cannot write into \"apps\" directory" => "Cannot write into \"apps\" directory",
+"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.",
+"Cannot create \"data\" directory (%s)" => "Cannot create \"data\" directory (%s)",
+"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>.",
+"Setting locale to %s failed" => "Setting locale to %s failed",
+"Please install one of theses locales on your system and restart your webserver." => "Please install one of theses locales on your system and restart your webserver.",
+"Please ask your server administrator to install the module." => "Please ask your server administrator to install the module.",
+"PHP module %s not installed." => "PHP module %s not installed.",
+"PHP %s or higher is required." => "PHP %s or higher is required.",
+"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community.",
+"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.",
+"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.",
+"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.",
+"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.",
+"PHP modules have been installed, but they are still listed as missing?" => "PHP modules have been installed, but they are still listed as missing?",
+"Please ask your server administrator to restart the web server." => "Please ask your server administrator to restart the web server.",
+"PostgreSQL >= 9 required" => "PostgreSQL >= 9 required",
+"Please upgrade your database version" => "Please upgrade your database version",
+"Error occurred while checking PostgreSQL version" => "Error occurred while checking PostgreSQL version",
+"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error",
+"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
+"Data directory (%s) is readable by other users" => "Data directory (%s) is readable by other users",
+"Data directory (%s) is invalid" => "Data directory (%s) is invalid",
+"Please check that the data directory contains a file \".ocdata\" in its root." => "Please check that the data directory contains a file \".ocdata\" in its root.",
 "Could not obtain lock type %d on \"%s\"." => "Could not obtain lock type %d on \"%s\"."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 8354c3bedef..8d580f6125b 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -1,5 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Cannot write into \"config\" directory!" => "Non é posíbel escribir no directorio «config»!",
+"This can usually be fixed by giving the webserver write access to the config directory" => "Polo xeral, isto pode ser fixado para permitirlle ao servidor web acceso de escritura  ao directorio «config»",
+"See %s" => "Vexa %s",
+"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «config»%s.",
 "You are accessing the server from an untrusted domain." => "Esta accedendo desde un dominio non fiábel.",
 "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
 "Help" => "Axuda",
@@ -86,6 +90,33 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "Debe fornecer un nome de usuario",
 "A valid password must be provided" => "Debe fornecer un contrasinal",
 "The username is already being used" => "Este nome de usuario xa está a ser usado",
+"No database drivers (sqlite, mysql, or postgresql) installed." => "Non hay controladores de base de datos (sqlite, mysql, ou postgresql) instalados.",
+"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «root»%s.",
+"Cannot write into \"config\" directory" => "Non é posíbel escribir no directorio «config»",
+"Cannot write into \"apps\" directory" => "Non é posíbel escribir no directorio «apps»",
+"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «apps»%s ou a desactivación da «appstore» no ficheiro de configuración.",
+"Cannot create \"data\" directory (%s)" => "Non é posíbel crear o directorio «data» (%s)",
+"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Polo xeral, isto pode ser fixado para <a href=\"%s\" target=\"_blank\">permitirlle ao servidor web acceso de escritura  ao directorio «root»</a>.",
+"Setting locale to %s failed" => "Fallou o axuste da configuración local a %s",
+"Please install one of theses locales on your system and restart your webserver." => "Instale unha destas configuracións locais no seu sistema e reinicie o servidor web.",
+"Please ask your server administrator to install the module." => "Pregúntelle ao administrador do servidor pola instalación do módulo.",
+"PHP module %s not installed." => "O módulo PHP %s non está instalado.",
+"PHP %s or higher is required." => "Requirese PHP %s ou superior.",
+"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.",
+"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "O modo seguro de PHP está activado. ownCloud precisa que estea desactivado para traballar doadamente.",
+"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "O modo seguro de PHP é un entorno en desuso e maiormente inútil que ten que seren desactivado. Pregúntelle ao administrador do servidor pola desactivación en php.ini ou na configuración do servidor web.",
+"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "«Magic Quotes» está activado. ownCloud precisa que estea desactivado para traballar doadamente.",
+"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "«Magic Quotes» é un entorno en desuso e maiormente inútil que ten que seren desactivado. Pregúntelle ao administrador do servidor pola desactivación en php.ini ou na configuración do servidor web.",
+"PHP modules have been installed, but they are still listed as missing?" => "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?",
+"Please ask your server administrator to restart the web server." => "Pregúntelle ao administrador do servidor polo reinicio do servidor web..",
+"PostgreSQL >= 9 required" => "Requírese PostgreSQL >= 9",
+"Please upgrade your database version" => "Anove a versión da súa base de datos",
+"Error occurred while checking PostgreSQL version" => "Produciuse un erro mentres comprobaba a versión de PostgreSQL",
+"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Asegúrese de que dispón do PostgreSQL >= 9 ou comprobe os rexistros para obter máis información sobre este erro",
+"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Cambie os permisos a 0770 para que o directorio non poida seren listado por outros usuarios.",
+"Data directory (%s) is readable by other users" => "O directorio de datos (%s) é lexíbel por outros usuarios",
+"Data directory (%s) is invalid" => "O directorio de datos (%s) non é correcto",
+"Please check that the data directory contains a file \".ocdata\" in its root." => "Comprobe que o directorio de datos conten un ficheiro «.ocdata» na súa raíz.",
 "Could not obtain lock type %d on \"%s\"." => "Non foi posíbel obter un bloqueo do tipo %d en «%s»."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
index aa779d62ce2..479eaa2368e 100644
--- a/lib/l10n/ja.php
+++ b/lib/l10n/ja.php
@@ -1,5 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Cannot write into \"config\" directory!" => "\"config\" ディレクトリに書き込みができません！",
+"This can usually be fixed by giving the webserver write access to the config directory" => "多くの場合、これはWEBサーバーに config ディレクトリへの書き込み権限を付与することで解決が可能です。",
+"See %s" => "%s を閲覧",
+"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "多くの場合、これは %sWEBサーバーに config ディレクトリへの書き込み権限を付与%s することで解決が可能です。",
 "You are accessing the server from an untrusted domain." => "信頼されていないドメインからサーバーにアクセスしています。",
 "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
 "Help" => "ヘルプ",
@@ -86,6 +90,33 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "有効なユーザー名を指定する必要があります",
 "A valid password must be provided" => "有効なパスワードを指定する必要があります",
 "The username is already being used" => "ユーザー名はすでに使われています",
+"No database drivers (sqlite, mysql, or postgresql) installed." => "データベースドライバー (sqlite, mysql, postgresql) がインストールされていません。",
+"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "多くの場合、パーミッションは %sWEBサーバーにルートディレクトリへの書き込み権限を付与%s することで解決が可能です。",
+"Cannot write into \"config\" directory" => "\"config\" ディレクトリに書き込みができません",
+"Cannot write into \"apps\" directory" => "\"apps\" ディレクトリに書き込みができません",
+"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "多くの場合、これは %sWEBサーバーに apps ディレクトリへの書き込み権限を付与%s するか、設定ファイルでアプリストアを無効化することで解決が可能です。",
+"Cannot create \"data\" directory (%s)" => "\"data\" ディレクトリ (%s) を作成できません",
+"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "多くの場合、これは<a href=\"%s\" target=\"_blank\">WEBサーバーにルートディレクトリへの書き込み権限を付与</a>することで解決が可能です。",
+"Setting locale to %s failed" => "ロケールを %s に設定できませんでした",
+"Please install one of theses locales on your system and restart your webserver." => "これらのロケールのいずれかをシステムにインストールし、WEBサーバーを再起動してください。",
+"Please ask your server administrator to install the module." => "サーバー管理者にモジュールのインストールを依頼してください。",
+"PHP module %s not installed." => "PHP のモジュール %s がインストールされていません。",
+"PHP %s or higher is required." => "PHP %s 以上が必要です。",
+"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "PHPを最新バージョンに更新するようサーバー管理者に依頼してください。現在のPHPのバージョンは、ownCloud および PHP コミュニティでサポートされていません。",
+"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHPセーフモードは有効です。ownCloud を適切に動作させるには無効化する必要があります。",
+"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHPセーフモードは多くの場合において役に立たない設定のため、無効化すべきです。サーバー管理者に php.ini もしくはWEBサーバー設定で無効化するよう依頼してください。",
+"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "マジッククォートは有効です。ownCloud を適切に動作させるには無効化する必要があります。",
+"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "マジッククォートは多くの場合において役に立たない設定のため、無効化すべきです。サーバー管理者に php.ini もしくはWEBサーバー設定で無効化するよう依頼してください。",
+"PHP modules have been installed, but they are still listed as missing?" => "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか？",
+"Please ask your server administrator to restart the web server." => "サーバー管理者にWEBサーバーを再起動するよう依頼してください。",
+"PostgreSQL >= 9 required" => "PostgreSQL >= 9 が必要です",
+"Please upgrade your database version" => "新しいバージョンのデータベースにアップグレードしてください",
+"Error occurred while checking PostgreSQL version" => "PostgreSQL のバージョンチェック中にエラーが発生しました",
+"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "PostgreSQL >= 9 がインストールされているかどうか確認して下さい。もしくは、ログからエラーに関する詳細な情報を確認して下さい。",
+"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "ディレクトリが他のユーザーから見えないように、パーミッションを 0770 に変更してください。",
+"Data directory (%s) is readable by other users" => "データディレクトリ (%s) は他のユーザーも閲覧することができます",
+"Data directory (%s) is invalid" => "データディレクトリ (%s) は無効です",
+"Please check that the data directory contains a file \".ocdata\" in its root." => "データディレクトリに \".ocdata\" ファイルが含まれていることを確認して下さい。",
 "Could not obtain lock type %d on \"%s\"." => "\"%s\" で %d タイプのロックを取得できませんでした。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php
index 8dbfabe443c..6443cf4ed48 100644
--- a/lib/private/db/migrator.php
+++ b/lib/private/db/migrator.php
@@ -84,7 +84,7 @@ class Migrator {
 	 * @return string
 	 */
 	protected function generateTemporaryTableName($name) {
-		return 'oc_' . $name . '_' . uniqid();
+		return 'oc_' . $name . '_' . \OCP\Util::generateRandomBytes(13);
 	}
 
 	/**
@@ -133,7 +133,7 @@ class Migrator {
 				$indexName = $index->getName();
 			} else {
 				// avoid conflicts in index names
-				$indexName = 'oc_' . uniqid();
+				$indexName = 'oc_' . \OCP\Util::generateRandomBytes(13);
 			}
 			$newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
 		}