]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into files_encryption to get the latest files_trashbin app
authorFlorin Peter <github@florin-peter.de>
Tue, 30 Apr 2013 18:53:56 +0000 (20:53 +0200)
committerFlorin Peter <github@florin-peter.de>
Tue, 30 Apr 2013 18:53:56 +0000 (20:53 +0200)
Conflicts:
apps/files/l10n/bn_BD.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/hr.php
apps/files/l10n/ms_MY.php
apps/files/l10n/ro.php
apps/files/l10n/si_LK.php
apps/files/l10n/sl.php
apps/files/l10n/ta_LK.php
apps/files_external/l10n/de_DE.php
apps/files_external/l10n/et_EE.php
apps/user_ldap/l10n/tr.php
core/l10n/bg_BG.php
l10n/af_ZA/files.po
l10n/af_ZA/files_external.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_external.po
l10n/be/files.po
l10n/be/files_external.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/files_external.po
l10n/bg_BG/files_trashbin.po
l10n/bg_BG/files_versions.po
l10n/bg_BG/settings.po
l10n/bn_BD/core.po
l10n/bn_BD/files.po
l10n/bn_BD/files_external.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/files_external.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/lib.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_external.po
l10n/cy_GB/settings.po
l10n/da/core.po
l10n/da/files.po
l10n/da/files_external.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_external.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/files_external.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/files_external.po
l10n/es/core.po
l10n/es/files.po
l10n/es/files_external.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/files_external.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_external.po
l10n/fi/files.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/files_external.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/files_external.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/files_external.po
l10n/he/core.po
l10n/he/files.po
l10n/he/files_external.po
l10n/hi/files.po
l10n/hi/files_external.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/files_external.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hy/files.po
l10n/hy/files_external.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_external.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_external.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_external.po
l10n/it/core.po
l10n/it/files.po
l10n/it/files_external.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_external.po
l10n/ka/files.po
l10n/ka/files_external.po
l10n/ka_GE/core.po
l10n/ka_GE/files.po
l10n/ka_GE/files_external.po
l10n/kn/files.po
l10n/kn/files_external.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/files_external.po
l10n/ku_IQ/files.po
l10n/ku_IQ/files_external.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/files_external.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/files_external.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/files_external.po
l10n/my_MM/files.po
l10n/my_MM/files_external.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/ne/files.po
l10n/ne/files_external.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nn_NO/files.po
l10n/nn_NO/files_external.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/files_external.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/files_external.po
l10n/pl_PL/files.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/files_external.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_external.po
l10n/sk/files.po
l10n/sk/files_external.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_external.po
l10n/sq/core.po
l10n/sq/files.po
l10n/sq/files_external.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/files_external.po
l10n/sr@latin/files.po
l10n/sr@latin/files_external.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/files_external.po
l10n/sw_KE/files.po
l10n/sw_KE/files_external.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/files_external.po
l10n/te/files.po
l10n/te/files_external.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/user_ldap.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_external.po
l10n/ur_PK/files.po
l10n/ur_PK/files_external.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_HK/core.po
l10n/zh_HK/files.po
l10n/zh_HK/files_external.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_external.po
lib/base.php
lib/files/mount/mount.php

52 files changed:
1  2 
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/es_AR.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ka_GE.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/lv.php
apps/files/l10n/mk.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/oc.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sr.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files/l10n/zh_CN.GB2312.php
apps/files/l10n/zh_CN.php
apps/files_external/l10n/es.php
core/l10n/cs_CZ.php
core/l10n/zh_CN.php
lib/files/cache/cache.php
lib/files/filesystem.php
lib/files/view.php
lib/public/share.php
lib/templatelayout.php
lib/util.php
settings/js/personal.js
settings/l10n/bg_BG.php
settings/templates/personal.php

index 41e6a225a2b745a9ca7021306b51e48542a515e7,bc01a3406228e3d6c563b6828035d85de65bda1d..a84adc3bb04c891129fa9871e386080a14e6cc55
@@@ -13,8 -13,9 +13,8 @@@
  "Not enough storage available" => "لا يوجد مساحة تخزينية كافية",
  "Invalid directory." => "مسار غير صحيح.",
  "Files" => "الملفات",
 -"Share" => "شارك",
  "Delete permanently" => "حذف بشكل دائم",
- "Delete" => "محذوف",
+ "Delete" => "إلغاء",
  "Rename" => "إعادة تسميه",
  "Pending" => "قيد الانتظار",
  "{new_name} already exists" => "{new_name} موجود مسبقا",
Simple merge
index d92dbeef67cec056c069065f86cd06c5e610c653,ff9572ad99eac6d0e33df0fa2bc3889ffd2ff87f..a294fbdce47db044b2f3701d9c086634e073739a
  "Not enough storage available" => "No hi ha prou espai disponible",
  "Invalid directory." => "Directori no vàlid.",
  "Files" => "Fitxers",
 -"Share" => "Comparteix",
  "Delete permanently" => "Esborra permanentment",
- "Delete" => "Suprimeix",
+ "Delete" => "Esborra",
  "Rename" => "Reanomena",
- "Pending" => "Pendents",
+ "Pending" => "Pendent",
  "{new_name} already exists" => "{new_name} ja existeix",
  "replace" => "substitueix",
  "suggest name" => "sugereix un nom",
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 36ba7cc5de243e65f1df707a88a6a48e88d5aea1,963f25ebedcd661eb55f46ecd4c458b116fd0a91..3facc4f8597d536f4d1c79af66e5fae9af6eca34
@@@ -1,13 -1,14 +1,13 @@@
  <?php $TRANSLATIONS = array(
  "No file was uploaded. Unknown error" => "לא הועלה קובץ. טעות בלתי מזוהה.",
- "There is no error, the file uploaded with success" => "×\9c×\90 ×\90×\99רע×\94 ×ª×§×\9c×\94, ×\94ק×\91צ×\99×\9d ×\94×\95×¢×\9c×\95 בהצלחה",
+ "There is no error, the file uploaded with success" => "×\9c×\90 ×\94תר×\97ש×\94 ×©×\92×\99×\90×\94, ×\94ק×\95×\91×¥ ×\94×\95×¢×\9c×\94 בהצלחה",
  "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "×\94ק×\95×\91×¥ ×©×\94×\95×¢×\9c×\94 ×\97ר×\92 ×\9e×\94×\94× ×\97×\99×\94 MAX_FILE_SIZE ×©×¦×\95×\99× ×\94 ×\91×\98×\95פס ×\94Ö¾HTML",
- "The uploaded file was only partially uploaded" => "×\94ק×\95×\91×¥ ×©×\94×\95×¢×\9c×\94 ×\94×\95×¢×\9c×\94 ×\91צ×\95ר×\94 ×\97×\9cק×\99ת",
- "No file was uploaded" => "×\9c×\90 ×\94×\95×¢×\9c×\95 ×§×\91צ×\99×\9d",
- "Missing a temporary folder" => "ת×\99ק×\99יה זמנית חסרה",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "×\94ק×\95×\91×¥ ×©×\94×\95×¢×\9c×\94 ×\92×\93×\95×\9a ×\9e×\94ער×\9a MAX_FILE_SIZE ×©×\94×\95×\92×\93ר ×\91ת×\95פס HTML",
+ "The uploaded file was only partially uploaded" => "×\94ק×\95×\91×¥ ×\94×\95×¢×\9c×\94 ×\91×\90×\95פ×\9f ×\97×\9cק×\99 ×\91×\9c×\91×\93",
+ "No file was uploaded" => "ש×\95×\9d ×§×\95×\91×¥ ×\9c×\90 ×\94×\95×¢×\9c×\94",
+ "Missing a temporary folder" => "תקיה זמנית חסרה",
  "Failed to write to disk" => "הכתיבה לכונן נכשלה",
  "Files" => "קבצים",
 -"Share" => "שתף",
  "Delete permanently" => "מחק לצמיתות",
  "Delete" => "מחיקה",
  "Rename" => "שינוי שם",
Simple merge
index b3233cc37d08da4fbb17678b4e18654064c41ce3,74aad4df389434c56cb8e83c23468ee7a6b11507..457f771e4605aa9701e4ef5adb40870515071013
@@@ -1,8 -1,9 +1,8 @@@
  <?php $TRANSLATIONS = array(
  "The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
- "No file was uploaded" => "Nulle file esseva incargate",
+ "No file was uploaded" => "Nulle file esseva incargate.",
  "Missing a temporary folder" => "Manca un dossier temporari",
  "Files" => "Files",
 -"Share" => "Compartir",
  "Delete" => "Deler",
  "Name" => "Nomine",
  "Size" => "Dimension",
Simple merge
Simple merge
Simple merge
Simple merge
index 88378bb486f866e5ebd0c6d497935ff693117537,711c53ee49f377f15cfe76726f428dc71304e6e1..c35bdd115edd38e0e0884410a312efcf6778ceda
  "Failed to write to disk" => "디스크에 쓰지 못했습니다",
  "Invalid directory." => "올바르지 않은 디렉터리입니다.",
  "Files" => "파일",
 -"Share" => "공유",
  "Delete" => "삭제",
  "Rename" => "이름 바꾸기",
- "Pending" => "ë³´ë¥\98 중",
+ "Pending" => "ë\8c\80기 중",
  "{new_name} already exists" => "{new_name}이(가) 이미 존재함",
  "replace" => "바꾸기",
  "suggest name" => "이름 제안",
Simple merge
Simple merge
Simple merge
index 78fed25cf9234dfae9994084db9e79708ab55249,992618f06bfc044c4181be525a9b54f34346140e..32e7eadb936566a20f885295b87fccb3c5e3668e
@@@ -1,13 -1,14 +1,13 @@@
  <?php $TRANSLATIONS = array(
  "No file was uploaded. Unknown error" => "Ниту еден фајл не се вчита. Непозната грешка",
- "There is no error, the file uploaded with success" => "Ð\9dема Ð³Ñ\80еÑ\88ка, Ð´Ð°Ñ\82оÑ\82екаÑ\82а Ð±ÐµÑ\88е Ð¿Ð¾Ð´Ð¸Ð³Ð½Ð°Ñ\82а Ñ\83Ñ\81пеÑ\88но",
+ "There is no error, the file uploaded with success" => "Ð\94аÑ\82оÑ\82екаÑ\82а Ð±ÐµÑ\88е Ñ\83Ñ\81пеÑ\88но Ð¿Ð¾Ð´Ð¸Ð³Ð½Ð°Ñ\82а.",
  "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ð\9fодигнаÑ\82аÑ\82а Ð´Ð°Ñ\82оÑ\82екаÑ\82а Ñ\98а Ð½Ð°Ð´Ð¼Ð¸Ð½Ñ\83ва MAX_FILE_SIZE Ð´Ð¸Ñ\80екÑ\82иваÑ\82а ÐºÐ¾Ñ\98а Ð±ÐµÑ\88е Ð¿Ð¾Ñ\81Ñ\82авена во HTML формата",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ð\93олеминаÑ\82а Ð½Ð° Ð´Ð°Ñ\82оÑ\82екаÑ\82а Ñ\98а Ð½Ð°Ð´Ð¼Ð¸Ð½Ñ\83ва MAX_FILE_SIZE Ð´Ð¸Ñ\80екÑ\82иваÑ\82а ÐºÐ¾Ñ\98а Ð±ÐµÑ\88е Ñ\81пеÑ\86иÑ\84иÑ\86иÑ\80ана во HTML формата",
  "The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
- "No file was uploaded" => "Не беше подигната датотека",
- "Missing a temporary folder" => "Не постои привремена папка",
+ "No file was uploaded" => "Не беше подигната датотека.",
+ "Missing a temporary folder" => "Недостасува привремена папка",
  "Failed to write to disk" => "Неуспеав да запишам на диск",
  "Files" => "Датотеки",
 -"Share" => "Сподели",
  "Delete" => "Избриши",
  "Rename" => "Преименувај",
  "Pending" => "Чека",
index 54042c91243c5efa3336c91b4832ed8977bc4de3,1ff21b1f0e23faf454b7759f120bc657de52fd7a..98f91b3eb54fcf1bd14e629eaf01d08824cef5fa
@@@ -1,12 -1,13 +1,12 @@@
  <?php $TRANSLATIONS = array(
  "No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
- "There is no error, the file uploaded with success" => "Det er ingen feil. Filen ble lastet opp.",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet",
- "The uploaded file was only partially uploaded" => "Filopplastningen ble bare delvis gjennomført",
- "No file was uploaded" => "Ingen fil ble lastet opp",
- "Missing a temporary folder" => "Mangler en midlertidig mappe",
+ "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
+ "The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
+ "No file was uploaded" => "Ingen filer ble lastet opp",
+ "Missing a temporary folder" => "Mangler midlertidig mappe",
  "Failed to write to disk" => "Klarte ikke å skrive til disk",
  "Files" => "Filer",
 -"Share" => "Del",
  "Delete permanently" => "Slett permanent",
  "Delete" => "Slett",
  "Rename" => "Omdøp",
Simple merge
Simple merge
Simple merge
Simple merge
index c06108cf2b32baad1ba369c37a3d85b1463c9329,a5de64cc1db66538a0491bb3e49ef8b8c68dad71..b799a4b81aee54dbe196aba86de0aee6e54a4931
@@@ -13,8 -13,9 +13,8 @@@
  "Not enough storage available" => "Não há espaço suficiente em disco",
  "Invalid directory." => "Directório Inválido",
  "Files" => "Ficheiros",
 -"Share" => "Partilhar",
  "Delete permanently" => "Eliminar permanentemente",
- "Delete" => "Apagar",
+ "Delete" => "Eliminar",
  "Rename" => "Renomear",
  "Pending" => "Pendente",
  "{new_name} already exists" => "O nome {new_name} já existe",
Simple merge
index ee89a4c7d630043eb71ec5d9cb854b6f33ae89e3,86f01bfb0edf4bc8bc3bf59fba04b8e0e0c4762a..42eb3b12383a41032ee2519476dbc123770cccf3
  "Not enough storage available" => "Nedostatok dostupného úložného priestoru",
  "Invalid directory." => "Neplatný priečinok",
  "Files" => "Súbory",
 -"Share" => "Zdieľať",
  "Delete permanently" => "Zmazať  trvalo",
- "Delete" => "Odstrániť",
+ "Delete" => "Zmazať",
  "Rename" => "Premenovať",
- "Pending" => "Čaká sa",
+ "Pending" => "Prebieha",
  "{new_name} already exists" => "{new_name} už existuje",
  "replace" => "nahradiť",
  "suggest name" => "pomôcť s menom",
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 33e21e544cd0bbc90927618893567ac4b716f2e9,0d87975918e4a0705a5871c94b61a79f3dec4246..f0de736e7ab52a7bc6d5a18e363f7edba1357c7b
@@@ -1,15 -1,16 +1,15 @@@
  <?php $TRANSLATIONS = array(
  "No file was uploaded. Unknown error" => "没有上传文件。未知错误",
- "There is no error, the file uploaded with success" => "没æ\9c\89ä»»ä½\95é\94\99误,æ\96\87件ä¸\8aä¼ æ\88\90å\8a\9fäº\86",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了HTML表单指定的MAX_FILE_SIZE",
- "The uploaded file was only partially uploaded" => "文件只有部分被上传",
- "No file was uploaded" => "没有上传完成的文件",
- "Missing a temporary folder" => "丢失了一个临时文件夹",
+ "There is no error, the file uploaded with success" => "æ\96\87件ä¸\8aä¼ æ\88\90å\8a\9f",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了 HTML 表格中指定的 MAX_FILE_SIZE 选项",
+ "The uploaded file was only partially uploaded" => "文件部分上传",
+ "No file was uploaded" => "没有上传文件",
+ "Missing a temporary folder" => "缺失临时文件夹",
  "Failed to write to disk" => "写磁盘失败",
  "Files" => "文件",
 -"Share" => "分享",
  "Delete" => "删除",
  "Rename" => "重命名",
- "Pending" => "Pending",
+ "Pending" => "等待中",
  "{new_name} already exists" => "{new_name} 已存在",
  "replace" => "替换",
  "suggest name" => "推荐名称",
Simple merge
Simple merge
Simple merge
index 926d4691ed12f544a5e11e93ec1a464ca6d6f6bf,0b6f0dfbdb5c8c9f5bb0a053029dfe7d6bfa0fb0..49cd1e2ebf37946008fec8ff24e00f7e9d284f0c
  "Access forbidden" => "访问禁止",
  "Cloud not found" => "未找到云",
  "Edit categories" => "编辑分类",
- "Add" => "加",
+ "Add" => "加",
  "Security Warning" => "安全警告",
 -"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
 -"Please update your PHP installation to use ownCloud securely." => "为保证安全使用 ownCloud 请更新您的PHP。",
  "No secure random number generator is available, please enable the PHP OpenSSL extension." => "随机数生成器无效,请启用PHP的OpenSSL扩展",
  "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器,攻击者可能会猜测密码重置信息从而窃取您的账户",
  "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问,因为 .htaccess 并未正常工作。",
index 4e32ff2ba8a374a29f2c065e948c82501b7a115c,47f3c272b13b32c0fadc6831cafa6f152cd8caf6..76a23c2573b59239bd71840afbe320d34387957f
@@@ -392,10 -381,10 +382,10 @@@ class Cache 
         */
        public function search($pattern) {
                $query = \OC_DB::prepare('
 -                      SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
 +                      SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
                        FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `storage` = ?'
                );
-               $result = $query->execute(array($pattern, $this->numericId));
+               $result = $query->execute(array($pattern, $this->getNumericStorageId()));
                $files = array();
                while ($row = $result->fetchRow()) {
                        $row['mimetype'] = $this->getMimetype($row['mimetype']);
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/util.php
Simple merge
Simple merge
Simple merge
Simple merge