diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/l10n/es_AR.php | 6 | ||||
| -rw-r--r-- | lib/l10n/ko.php | 27 | ||||
| -rw-r--r-- | lib/l10n/ru.php | 6 | ||||
| -rw-r--r-- | lib/l10n/th_TH.php | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | lib/request.php | 6 |
5 files changed, 47 insertions, 4 deletions
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php index 93637a69d42..2bbffd39e9e 100644 --- a/lib/l10n/es_AR.php +++ b/lib/l10n/es_AR.php @@ -18,13 +18,17 @@ "seconds ago" => "hace unos segundos", "1 minute ago" => "hace 1 minuto", "%d minutes ago" => "hace %d minutos", +"1 hour ago" => "1 hora atrás", +"%d hours ago" => "%d horas atrás", "today" => "hoy", "yesterday" => "ayer", "%d days ago" => "hace %d días", "last month" => "este mes", +"%d months ago" => "%d meses atrás", "last year" => "este año", "years ago" => "hace años", "%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponible. Conseguí <a href=\"%s\">más información</a>", "up to date" => "actualizado", -"updates check is disabled" => "comprobar actualizaciones está desactivado" +"updates check is disabled" => "comprobar actualizaciones está desactivado", +"Could not find category \"%s\"" => "No fue posible encontrar la categoría \"%s\"" ); diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php index 8afeb028f89..6f32e3b54ec 100644 --- a/lib/l10n/ko.php +++ b/lib/l10n/ko.php @@ -3,7 +3,32 @@ "Personal" => "개인의", "Settings" => "설정", "Users" => "사용자", +"Apps" => "어플리케이션", +"Admin" => "관리자", +"ZIP download is turned off." => "ZIP 다운로드가 꺼졌습니다.", +"Files need to be downloaded one by one." => "파일 차례대로 다운로드가 필요합니다.", +"Back to Files" => "파일로 돌아가기", +"Selected files too large to generate zip file." => "zip 파일 생성하기 위한 너무 많은 파일들이 선택되었습니다.", +"Application is not enabled" => "응용프로그램이 사용 가능하지 않습니다.", "Authentication error" => "인증 오류", +"Token expired. Please reload page." => "토큰 만료. 페이지를 새로고침 해주세요.", "Files" => "파일", -"Text" => "문자 번호" +"Text" => "문자 번호", +"Images" => "그림", +"seconds ago" => "초 전", +"1 minute ago" => "1분 전", +"%d minutes ago" => "%d 분 전", +"1 hour ago" => "1 시간 전", +"%d hours ago" => "%d 시간 전", +"today" => "오늘", +"yesterday" => "어제", +"%d days ago" => "%d 일 전", +"last month" => "지난 달", +"%d months ago" => "%d 달 전", +"last year" => "지난 해", +"years ago" => "작년", +"%s is available. Get <a href=\"%s\">more information</a>" => "%s은 가능합니다. 더 자세한 정보는 <a href=\"%s\">이곳</a>으로..", +"up to date" => "최신", +"updates check is disabled" => "업데이트 확인이 비활성화 되어있습니다.", +"Could not find category \"%s\"" => "\"%s\" 카테고리를 찾을 수 없습니다." ); diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index 039158545d2..3ed55f8e9dc 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -18,13 +18,17 @@ "seconds ago" => "менее минуты", "1 minute ago" => "1 минуту назад", "%d minutes ago" => "%d минут назад", +"1 hour ago" => "час назад", +"%d hours ago" => "%d часов назад", "today" => "сегодня", "yesterday" => "вчера", "%d days ago" => "%d дней назад", "last month" => "в прошлом месяце", +"%d months ago" => "%d месяцев назад", "last year" => "в прошлом году", "years ago" => "годы назад", "%s is available. Get <a href=\"%s\">more information</a>" => "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>", "up to date" => "актуальная версия", -"updates check is disabled" => "проверка обновлений отключена" +"updates check is disabled" => "проверка обновлений отключена", +"Could not find category \"%s\"" => "Категория \"%s\" не найдена" ); diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php index acb56a4cb09..75fa02f84b0 100644 --- a/lib/l10n/th_TH.php +++ b/lib/l10n/th_TH.php @@ -18,13 +18,17 @@ "seconds ago" => "วินาทีที่ผ่านมา", "1 minute ago" => "1 นาทีมาแล้ว", "%d minutes ago" => "%d นาทีที่ผ่านมา", +"1 hour ago" => "1 ชั่วโมงก่อนหน้านี้", +"%d hours ago" => "%d ชั่วโมงก่อนหน้านี้", "today" => "วันนี้", "yesterday" => "เมื่อวานนี้", "%d days ago" => "%d วันที่ผ่านมา", "last month" => "เดือนที่แล้ว", +"%d months ago" => "%d เดือนมาแล้ว", "last year" => "ปีที่แล้ว", "years ago" => "ปีที่ผ่านมา", "%s is available. Get <a href=\"%s\">more information</a>" => "%s พร้อมให้ใช้งานได้แล้ว. <a href=\"%s\">ดูรายละเอียดเพิ่มเติม</a>", "up to date" => "ทันสมัย", -"updates check is disabled" => "การตรวจสอบชุดอัพเดทถูกปิดใช้งานไว้" +"updates check is disabled" => "การตรวจสอบชุดอัพเดทถูกปิดใช้งานไว้", +"Could not find category \"%s\"" => "ไม่พบหมวดหมู่ \"%s\"" ); diff --git a/lib/request.php b/lib/request.php index 287d20d1a5d..c975c84a711 100644..100755 --- a/lib/request.php +++ b/lib/request.php @@ -18,6 +18,9 @@ class OC_Request { if(OC::$CLI) { return 'localhost'; } + if(OC_Config::getValue('overwritehost', '')<>''){ + return OC_Config::getValue('overwritehost'); + } if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) { if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) { $host = trim(array_pop(explode(",", $_SERVER['HTTP_X_FORWARDED_HOST']))); @@ -40,6 +43,9 @@ class OC_Request { * Returns the server protocol. It respects reverse proxy servers and load balancers */ public static function serverProtocol() { + if(OC_Config::getValue('overwriteprotocol', '')<>''){ + return OC_Config::getValue('overwriteprotocol'); + } if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) { $proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']); }else{ |