diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.css | 2 | ||||
| -rw-r--r-- | core/css/styles.css | 31 | ||||
| -rw-r--r-- | core/l10n/bg_BG.php | 4 | ||||
| -rw-r--r-- | core/l10n/fa.php | 25 | ||||
| -rw-r--r-- | core/l10n/ia.php | 15 | ||||
| -rw-r--r-- | core/l10n/sl.php | 3 | ||||
| -rw-r--r-- | core/l10n/ta_IN.php | 4 | ||||
| -rw-r--r-- | core/l10n/zh_HK.php | 30 | ||||
| -rw-r--r-- | core/lostpassword/controller/lostcontroller.php | 25 |
9 files changed, 119 insertions, 20 deletions
diff --git a/core/css/header.css b/core/css/header.css index 86db48a3f08..2df8cdd3aa3 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -190,6 +190,8 @@ #navigation .app-icon { margin: 0 auto; padding: 0; + max-height: 32px; + max-width: 32px; } /* Apps management */ diff --git a/core/css/styles.css b/core/css/styles.css index 40c1622ca26..c7d858a4feb 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -444,13 +444,15 @@ input[name='password-clone'] { .groupbottom { position: relative; } -#body-login .grouptop input { +#body-login .grouptop input, +.grouptop input { margin-bottom: 0; border-bottom: 0; border-bottom-left-radius: 0; border-bottom-right-radius: 0; } -#body-login .groupmiddle input { +#body-login .groupmiddle input, +.groupmiddle input { margin-top: 0; margin-bottom: 0; border-top: 0; @@ -458,7 +460,8 @@ input[name='password-clone'] { border-radius: 0; box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important; } -#body-login .groupbottom input { +#body-login .groupbottom input, +.groupbottom input { margin-top: 0; border-top: 0; border-top-right-radius: 0; @@ -854,6 +857,28 @@ div.crumb:active { opacity: 0; } + +/* public footer */ +#body-public footer { + margin-top: 65px; + text-align: center; +} + +#body-public footer .info { + color: #777; + text-align: center; + margin: 0 auto; + padding: 20px 0; +} + +#body-public footer .info a { + color: #777; + font-weight: bold; + padding: 13px; + margin: -13px; +} + + /* LEGACY FIX only - do not use fieldsets for settings */ fieldset.warning legend, fieldset.update legend { top: 18px; diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index 6880cd7c691..0d86e20d4cd 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -106,7 +106,7 @@ $TRANSLATIONS = array( "access control" => "контрол на достъпа", "create" => "Създаване", "update" => "Обновяване", -"delete" => "Изтриване", +"delete" => "изтрий", "Password protected" => "Защитено с парола", "Error unsetting expiration date" => "Грешка при премахване на дата за изтичане", "Error setting expiration date" => "Грешка при поставяне на дата за изтичане", @@ -115,7 +115,7 @@ $TRANSLATIONS = array( "Warning" => "Предупреждение", "The object type is not specified." => "Видът на обекта не е избран.", "Enter new" => "Въведи нов", -"Delete" => "Изтриване", +"Delete" => "Изтрий", "Add" => "Добавяне", "Edit tags" => "Промяна на етикетите", "Error loading dialog template: {error}" => "Грешка при зареждането на шаблоn за диалог: {error}.", diff --git a/core/l10n/fa.php b/core/l10n/fa.php index 522e752d3e7..1091d1f5590 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -1,7 +1,15 @@ <?php $TRANSLATIONS = array( +"Expiration date is in the past." => "تاریخ انقضا مربوط به گذشته است .", +"Couldn't send mail to following users: %s " => "ارسال ایمیل برای کاربران روبرو با شکست مواجه شد : %s", +"Turned on maintenance mode" => "حالت \" در دست تعمیر \" فعال شد .", +"Turned off maintenance mode" => "حالت \" در دست تعمیر \" غیرفعال شد .", +"Updated database" => "بروز رسانی پایگاه داده انجام شد .", +"Disabled incompatible apps: %s" => "اپ های ناسازگار غیرفعال شدند : %s", +"No image or file provided" => "هیچ فایل یا تصویری وارد نشده است", "Unknown filetype" => "نوع فایل ناشناخته", "Invalid image" => "عکس نامعتبر", +"No temporary profile picture available, try again" => "تصویر پروفایل موقت در حال حاضر در دسترس نیست ، دوباره تلاش کنید ", "Sunday" => "یکشنبه", "Monday" => "دوشنبه", "Tuesday" => "سه شنبه", @@ -23,6 +31,8 @@ $TRANSLATIONS = array( "December" => "دسامبر", "Settings" => "تنظیمات", "Folder" => "پوشه", +"Image" => "تصویر", +"Audio" => "صدا", "Saving..." => "در حال ذخیره سازی...", "seconds ago" => "ثانیه‌ها پیش", "_%n minute ago_::_%n minutes ago_" => array("%n دقیقه قبل"), @@ -34,20 +44,32 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n ماه قبل"), "last year" => "سال قبل", "years ago" => "سال‌های قبل", -"Reset password" => "دوباره سازی گذرواژه", +"Couldn't send reset email. Please contact your administrator." => "ارسال ایمیل مجدد با مشکل مواجه شد . لطفا با مدیر سیستم تماس بگیرید .", +"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟", +"I know what I'm doing" => "اطلاع از انجام این کار دارم", +"Reset password" => "تنظیم مجدد رمز عبور", +"Password can not be changed. Please contact your administrator." => "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .", "No" => "نه", "Yes" => "بله", "Choose" => "انتخاب کردن", +"Error loading file picker template: {error}" => "خطا در بارگذاری قالب انتخاب فایل : {error}", "Ok" => "قبول", +"Error loading message template: {error}" => "خطا در بارگذاری قالب پیام : {error}", "_{count} file conflict_::_{count} file conflicts_" => array(""), "New Files" => "فایل های جدید", +"Already existing files" => "فایل های موجود در حال حاضر ", +"Which files do you want to keep?" => "کدام فایل ها را می خواهید نگه دارید ؟", "Cancel" => "منصرف شدن", "Continue" => "ادامه", +"(all selected)" => "(همه انتخاب شده اند)", +"Very weak password" => "رمز عبور بسیار ضعیف", "Weak password" => "رمز عبور ضعیف", "So-so password" => "رمز عبور متوسط", "Good password" => "رمز عبور خوب", "Strong password" => "رمز عبور قوی", "Shared" => "اشتراک گذاشته شده", +"Shared with {recipients}" => "به اشتراک گذاشته شده با {recipients}", "Share" => "اشتراک‌گذاری", "Error" => "خطا", "Error while sharing" => "خطا درحال به اشتراک گذاشتن", @@ -55,6 +77,7 @@ $TRANSLATIONS = array( "Error while changing permissions" => "خطا در حال تغییر مجوز", "Shared with you and the group {group} by {owner}" => "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}", "Shared with you by {owner}" => "به اشتراک گذاشته شده با شما توسط { دارنده}", +"Share with user or group …" => "به اشتراک گذاری با کاربر یا گروه", "Share link" => "اشتراک گذاشتن لینک", "Password protect" => "نگهداری کردن رمز عبور", "Allow Public Upload" => "اجازه آپلود عمومی", diff --git a/core/l10n/ia.php b/core/l10n/ia.php index a999059f9a0..c67f523d24b 100644 --- a/core/l10n/ia.php +++ b/core/l10n/ia.php @@ -27,19 +27,24 @@ $TRANSLATIONS = array( "November" => "Novembre", "December" => "Decembre", "Settings" => "Configurationes", +"File" => "File", "Folder" => "Dossier", +"Image" => "Imagine", +"Audio" => "Audio", "Saving..." => "Salveguardante...", "seconds ago" => "secundas passate", "_%n minute ago_::_%n minutes ago_" => array("%n minuta passate","%n minutas passate"), "_%n hour ago_::_%n hours ago_" => array("%n hora passate","%n horas passate"), "today" => "hodie", "yesterday" => "heri", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("%n die ante","%n dies ante"), "last month" => "ultime mense", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("%n mense ante","%n menses ante"), "last year" => "ultime anno", "years ago" => "annos passate", +"I know what I'm doing" => "Io sape lo que io es facente", "Reset password" => "Reinitialisar contrasigno", +"Password can not be changed. Please contact your administrator." => "Contrasigno non pote esser modificate. Pro favor continge tu administrator.", "No" => "No", "Yes" => "Si", "Choose" => "Seliger", @@ -68,6 +73,7 @@ $TRANSLATIONS = array( "Share with user or group …" => "Compartir con usator o gruppo ...", "Share link" => "Compartir ligamine", "Password protect" => "Protegite per contrasigno", +"Choose a password for the public link" => "Selige un contrasigno pro le ligamine public", "Allow Public Upload" => "Permitter incargamento public", "Email link to person" => "Ligamine de e-posta a persona", "Send" => "Invia", @@ -104,6 +110,7 @@ $TRANSLATIONS = array( "Username" => "Nomine de usator", "Reset" => "Re-fixar", "New password" => "Nove contrasigno", +"New Password" => "Nove contrasigno", "For the best results, please consider using a GNU/Linux server instead." => "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.", "Personal" => "Personal", "Users" => "Usatores", @@ -123,6 +130,7 @@ $TRANSLATIONS = array( "Storage & database" => "Immagazinage & base de datos", "Data folder" => "Dossier de datos", "Configure the database" => "Configurar le base de datos", +"Only %s is available." => "Solmente %s es disponibile", "Database user" => "Usator de base de datos", "Database password" => "Contrasigno de base de datos", "Database name" => "Nomine de base de datos", @@ -138,6 +146,7 @@ $TRANSLATIONS = array( "remember" => "memora", "Log in" => "Aperir session", "Alternative Logins" => "Accessos de autorisation alternative", -"Thank you for your patience." => "Gratias pro tu patientia." +"Thank you for your patience." => "Gratias pro tu patientia.", +"Start update" => "Initia actualisation" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 1cf40ea2c2b..f5928b6db72 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -120,6 +120,7 @@ $TRANSLATIONS = array( "Please reload the page." => "Stran je treba ponovno naložiti", "The update was unsuccessful." => "Posodobitev je spodletela", "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", +"Couldn't reset password because the token is invalid" => "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.", "Couldn't send reset email. Please make sure your username is correct." => "Ni mogoče poslati elektronskega sporočila. Prepričajte se, da je uporabniško ime pravilno.", "%s password reset" => "Ponastavitev gesla %s", "Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}", @@ -167,6 +168,7 @@ $TRANSLATIONS = array( "Database name" => "Ime podatkovne zbirke", "Database tablespace" => "Razpredelnica podatkovne zbirke", "Database host" => "Gostitelj podatkovne zbirke", +"SQLite will be used as database. For larger installations we recommend to change this." => "Za podatkovno zbirko bo uporabljen SQLite. Za večje zbirke je priporočljivo to zamenjati.", "Finish setup" => "Končaj nastavitev", "Finishing …" => "Poteka zaključevanje opravila ...", "This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Program zahteva omogočeno skriptno podporo. Za pravilno delovanje je treba omogočiti <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in nato ponovno osvežiti vmesnik.", @@ -189,6 +191,7 @@ $TRANSLATIONS = array( "%s will be updated to version %s." => "%s bo posodobljen na različico %s.", "The following apps will be disabled:" => "Navedeni programi bodo onemogočeni:", "The theme %s has been disabled." => "Tema %s je onemogočena za uporabo.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.", "Start update" => "Začni posodobitev", "This ownCloud instance is currently being updated, which may take a while." => "Nastavitev oblaka ownCloud se trenutno posodablja. Opravilo je lahko dolgotrajno ...", "Please reload this page after a short time to continue using ownCloud." => "Ponovno naložite to stran po krajšem preteku časa in nadaljujte z uporabo oblaka ownCloud." diff --git a/core/l10n/ta_IN.php b/core/l10n/ta_IN.php index ffcdde48d47..da1021cd33e 100644 --- a/core/l10n/ta_IN.php +++ b/core/l10n/ta_IN.php @@ -1,9 +1,11 @@ <?php $TRANSLATIONS = array( +"Settings" => "அமைப்புகள்", "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), -"_{count} file conflict_::_{count} file conflicts_" => array("","") +"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Send" => "அனுப்பவும்" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php index 46b1476c55d..1418f0008ec 100644 --- a/core/l10n/zh_HK.php +++ b/core/l10n/zh_HK.php @@ -20,17 +20,25 @@ $TRANSLATIONS = array( "November" => "十一月", "December" => "十二月", "Settings" => "設定", -"_%n minute ago_::_%n minutes ago_" => array(""), -"_%n hour ago_::_%n hours ago_" => array(""), +"File" => "文件", +"Folder" => "資料夾", +"Image" => "圖片", +"Audio" => "聲音", +"Saving..." => "儲存中...", +"seconds ago" => "秒前", +"_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"), +"_%n hour ago_::_%n hours ago_" => array("%n 小時前"), "today" => "今日", "yesterday" => "昨日", -"_%n day ago_::_%n days ago_" => array(""), -"last month" => "前一月", -"_%n month ago_::_%n months ago_" => array(""), +"_%n day ago_::_%n days ago_" => array("%n 日前"), +"last month" => "上個月", +"_%n month ago_::_%n months ago_" => array("%n 月前"), +"last year" => "上年", +"years ago" => "年前", "Reset password" => "重設密碼", -"No" => "No", -"Yes" => "Yes", -"Ok" => "OK", +"No" => "否", +"Yes" => "是", +"Ok" => "確認", "_{count} file conflict_::_{count} file conflicts_" => array(""), "Cancel" => "取消", "Shared" => "已分享", @@ -41,6 +49,7 @@ $TRANSLATIONS = array( "Error while changing permissions" => "更改權限時發生錯誤", "Shared with you and the group {group} by {owner}" => "{owner}與你及群組的分享", "Shared with you by {owner}" => "{owner}與你的分享", +"Share link" => "分享連結", "Password protect" => "密碼保護", "Send" => "傳送", "Set expiration date" => "設定分享期限", @@ -52,15 +61,18 @@ $TRANSLATIONS = array( "update" => "更新", "delete" => "刪除", "Password protected" => "密碼保護", -"Sending ..." => "傳送中", +"Sending ..." => "發送中...", "Email sent" => "郵件已傳", +"Warning" => "警告", "Delete" => "刪除", "Add" => "加入", "The update was successful. Redirecting you to ownCloud now." => "更新成功, 正", "Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}", "You will receive a link to reset your password via Email." => "你將收到一封電郵", "Username" => "用戶名稱", +"Reset" => "重設", "New password" => "新密碼", +"New Password" => "新密碼", "Personal" => "個人", "Users" => "用戶", "Apps" => "軟件", diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php index b1be65b4f01..e4d51fde077 100644 --- a/core/lostpassword/controller/lostcontroller.php +++ b/core/lostpassword/controller/lostcontroller.php @@ -20,13 +20,36 @@ use \OC\Core\LostPassword\EncryptedDataException; class LostController extends Controller { + /** + * @var \OCP\IURLGenerator + */ protected $urlGenerator; + + /** + * @var \OCP\IUserManager + */ protected $userManager; + + /** + * @var \OC_Defaults + */ protected $defaults; + + /** + * @var IL10N + */ protected $l10n; protected $from; protected $isDataEncrypted; + + /** + * @var IConfig + */ protected $config; + + /** + * @var IUserSession + */ protected $userSession; public function __construct($appName, @@ -110,7 +133,7 @@ class LostController extends Controller { throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid')); } - if (!$user->setPassword($userId, $password)) { + if (!$user->setPassword($password)) { throw new \Exception(); } |