diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-05-28 14:55:42 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-05-28 14:55:42 +0200 |
| commit | cc0cf931365d0c515038015bc7792f8500fafcc3 (patch) | |
| tree | da17b2d05344140b040fd4c55a3851cdd08154c0 /lib | |
| parent | 9c99048429ff4bf0db742e58931c245d03efb060 (diff) | |
| parent | 1d720099c328fe3084e05fe3d2bdd9e49acb8dfe (diff) | |
| download | nextcloud-server-cc0cf931365d0c515038015bc7792f8500fafcc3.tar.gz nextcloud-server-cc0cf931365d0c515038015bc7792f8500fafcc3.zip | |
merge master into sessionclass
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/l10n/fr.php | 1 | ||||
| -rw-r--r-- | lib/l10n/zh_TW.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index af4efc2b63f..aed5d056f37 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -24,6 +24,7 @@ "%s set the database host." => "%s spécifiez l'hôte de la base de données.", "PostgreSQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide", "You need to enter either an existing account or the administrator." => "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur.", +"Oracle connection could not be established" => "La connexion Oracle ne peut pas être établie", "MySQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide", "DB Error: \"%s\"" => "Erreur de la base de données : \"%s\"", "Offending command was: \"%s\"" => "La requête en cause est : \"%s\"", diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php index ec7310d4e4e..4e0d50e7fc9 100644 --- a/lib/l10n/zh_TW.php +++ b/lib/l10n/zh_TW.php @@ -24,6 +24,7 @@ "%s set the database host." => "%s 設定資料庫主機。", "PostgreSQL username and/or password not valid" => "PostgreSQL 用戶名和/或密碼無效", "You need to enter either an existing account or the administrator." => "您必須輸入一個現有的帳號或管理員帳號。", +"Oracle connection could not be established" => "無法建立 Oracle 資料庫連線", "MySQL username and/or password not valid" => "MySQL 用戶名和/或密碼無效", "DB Error: \"%s\"" => "資料庫錯誤：\"%s\"", "Offending command was: \"%s\"" => "有問題的指令是：\"%s\"", |