summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/ajax/share.php6
-rw-r--r--core/css/styles.css4
-rw-r--r--core/doc/admin/index.php2
-rw-r--r--core/doc/user/index.php2
-rw-r--r--core/img/actions/logout.pngbin592 -> 706 bytes
-rw-r--r--core/img/actions/logout.svg118
-rw-r--r--core/js/share.js31
-rw-r--r--core/l10n/ar.php50
-rw-r--r--core/l10n/ca.php2
-rw-r--r--core/l10n/da.php21
-rw-r--r--core/l10n/de.php4
-rw-r--r--core/l10n/de_DE.php10
-rw-r--r--core/l10n/el.php8
-rw-r--r--core/l10n/eo.php8
-rw-r--r--core/l10n/fr.php7
-rw-r--r--core/l10n/he.php8
-rw-r--r--core/l10n/mk.php68
-rw-r--r--core/l10n/nl.php8
-rw-r--r--core/l10n/pl.php4
-rw-r--r--core/l10n/pt_PT.php8
-rw-r--r--core/l10n/ru_RU.php8
-rw-r--r--core/l10n/sl.php8
-rw-r--r--core/l10n/zh_CN.php7
-rw-r--r--core/lostpassword/controller.php2
-rw-r--r--core/templates/login.php76
25 files changed, 397 insertions, 73 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 12206e0fd79..72ffc52e997 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -89,12 +89,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
if ($type === 'dir')
$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
- // handle localhost installations
- $server_host = OCP\Util::getServerHost();
- if ($server_host === 'localhost')
- $server_host = "example.com";
- $default_from = 'sharing-noreply@' . $server_host;
+ $default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
// send it out now
diff --git a/core/css/styles.css b/core/css/styles.css
index 0730eeac9fa..d635916b5ae 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -193,13 +193,11 @@ fieldset.warning legend { color:#b94a48 !important; }
#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
-tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
+tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
tr:hover .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
tr .action { width:16px; height:16px; }
.header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
-
-table:not(.nostyle) tr { -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
tbody tr:hover, tr:active { background-color:#f8f8f8; }
#body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
diff --git a/core/doc/admin/index.php b/core/doc/admin/index.php
new file mode 100644
index 00000000000..7785f2ce2f1
--- /dev/null
+++ b/core/doc/admin/index.php
@@ -0,0 +1,2 @@
+Here goes the admin documentation.
+In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
diff --git a/core/doc/user/index.php b/core/doc/user/index.php
new file mode 100644
index 00000000000..ede62f05aee
--- /dev/null
+++ b/core/doc/user/index.php
@@ -0,0 +1,2 @@
+Here goes the user documentation
+In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png
index eb2ea766c31..37f62543ac2 100644
--- a/core/img/actions/logout.png
+++ b/core/img/actions/logout.png
Binary files differ
diff --git a/core/img/actions/logout.svg b/core/img/actions/logout.svg
index d95ac959778..0281fad43e7 100644
--- a/core/img/actions/logout.svg
+++ b/core/img/actions/logout.svg
@@ -11,11 +11,14 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
- width="18"
+ width="16"
height="16"
id="svg2403"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="system-shutdown-panel2.svg">
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="logout.svg"
+ inkscape:export-filename="logout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -26,14 +29,14 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
- inkscape:window-height="776"
+ inkscape:window-height="745"
id="namedview3047"
showgrid="false"
- inkscape:zoom="17.875"
- inkscape:cx="9"
- inkscape:cy="8"
+ inkscape:zoom="25.279067"
+ inkscape:cx="5.0341304"
+ inkscape:cy="6.4537904"
inkscape:window-x="0"
- inkscape:window-y="24"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg2403" />
<metadata
@@ -67,7 +70,7 @@
id="linearGradient2395"
xlink:href="#linearGradient3678"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)" />
<linearGradient
id="linearGradient3678">
<stop
@@ -79,17 +82,96 @@
style="stop-color:#e6e6e6;stop-opacity:1"
offset="1" />
</linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3879"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="8.083209" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3908"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.0000001,1.1920928e-8)"
+ x1="11.644068"
+ y1="2.4988678"
+ x2="11.644068"
+ y2="15.00281" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3914"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="8.083209" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3916"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.0000001,1.1920928e-8)"
+ x1="11.644068"
+ y1="2.4988678"
+ x2="11.644068"
+ y2="15.00281" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3919"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.0000001,1.1920928e-8)"
+ x1="11.644068"
+ y1="2.4988678"
+ x2="11.644068"
+ y2="15.00281" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3922"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="8.083209" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3925"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="15.216674" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3942"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,-0.42098964,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="15.216674" />
</defs>
<path
- d="M 5.8427514,4.45 C 0.60889,7.192151 2.9756281,15.05 8.959192,15.05 c 5.921233,0 8.575036,-7.449605 3.11644,-10.6 M 9,8 9,1.9996319"
- id="path3341-5"
- style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+ id="path3927"
+ d="m 8.0000634,1 c -0.4714045,0 -0.9610304,0.5419023 -0.95,1 l 0,6 c -0.00747,0.5283126 0.4216346,1 0.95,1 0.5283654,0 0.957472,-0.4716874 0.95,-1 l 0,-6 c 0.014622,-0.605105 -0.4785955,-1 -0.95,-1 z m -3.34375,2.5 c -0.087186,0.019294 -0.1716251,0.050959 -0.25,0.09375 -2.9994999,1.5715133 -3.91842874,4.7978566 -3.125,7.46875 C 2.0747421,13.733393 4.5611725,16 7.9688134,16 11.327833,16 13.846204,13.850562 14.687563,11.21875 15.528922,8.5869378 14.630363,5.3955638 11.562563,3.625 11.128957,3.3713639 10.503661,3.535122 10.250038,3.9687356 9.9964154,4.4023491 10.160192,5.0276401 10.593813,5.28125 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 C 2.5164474,8.5564313 3.0469519,6.451888 5.2813134,5.28125 5.6599659,5.0748887 5.8603711,4.5887067 5.7371222,4.1754605 5.6138734,3.7622144 5.1798937,3.4652349 4.7500634,3.5 4.7188384,3.49846 4.6875384,3.49846 4.6563134,3.5 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sccsccsccssscscssscscc" />
<path
- d="M 9,7 9,0.99963191"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3942);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 8.0000634,0 c -0.4714045,0 -1.0110304,0.54190231 -1,1 l 0,6 c -0.00747,0.5283126 0.4716346,1 1,1 0.5283654,0 1.007472,-0.4716874 1,-1 l 0,-6 c 0.014622,-0.60510499 -0.5285955,-1 -1,-1 z m -3.34375,2.5 a 0.95009499,0.95009499 0 0 0 -0.25,0.09375 C 1.4068135,4.1652633 0.48788466,7.3916066 1.2813134,10.0625 2.0747421,12.733393 4.5611725,15 7.9688134,15 c 3.3590196,0 5.8773906,-2.149438 6.7187496,-4.78125 0.841359,-2.6318122 -0.0572,-5.8231862 -3.125,-7.59375 a 0.95938009,0.95938009 0 1 0 -0.96875,1.65625 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 -0.577366,-1.9435687 -0.046862,-4.048112 2.1875,-5.21875 A 0.95009499,0.95009499 0 0 0 4.7500634,2.5 a 0.95009499,0.95009499 0 0 0 -0.09375,0 z"
id="path3716"
- style="fill:none;stroke:url(#linearGradient2395);stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
- <path
- d="M 5.8427514,3.45 C 0.60889,6.1921513 2.9756281,14.05 8.959192,14.05 c 5.921233,0 8.575036,-7.4496051 3.11644,-10.6"
- id="path3341"
- style="fill:none;stroke:url(#linearGradient2392);stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+ inkscape:connector-curvature="0" />
</svg>
diff --git a/core/js/share.js b/core/js/share.js
index df5ebf008b4..bb3ec010ff5 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -161,9 +161,9 @@ OC.Share={
if (link) {
html += '<div id="link">';
html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>';
- html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="'+t('core', 'Password protect')+'" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>';
html += '<br />';
html += '<input id="linkText" type="text" readonly="readonly" />';
+ html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
html += '<div id="linkPass">';
html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
html += '</div>';
@@ -347,9 +347,12 @@ OC.Share={
}
$('#linkText').val(link);
$('#linkText').show('blind');
+ $('#linkText').css('display','block');
$('#showPassword').show();
+ $('#showPassword+label').show();
if (password != null) {
$('#linkPass').show('blind');
+ $('#showPassword').attr('checked', true);
$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
}
$('#expiration').show();
@@ -359,6 +362,7 @@ OC.Share={
hideLink:function() {
$('#linkText').hide('blind');
$('#showPassword').hide();
+ $('#showPassword+label').hide();
$('#linkPass').hide();
$('#emailPrivateLink #email').hide();
$('#emailPrivateLink #emailButton').hide();
@@ -518,16 +522,25 @@ $(document).ready(function() {
$('#showPassword').live('click', function() {
$('#linkPass').toggle('blind');
+ if (!$('#showPassword').is(':checked') ) {
+ var itemType = $('#dropdown').data('item-type');
+ var itemSource = $('#dropdown').data('item-source');
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ);
+ } else {
+ $('#linkPassText').focus();
+ }
});
- $('#linkPassText').live('focusout', function(event) {
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
- $('#linkPassText').val('');
- $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
- });
- $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+ $('#linkPassText').live('focusout keyup', function(event) {
+ if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
+ var itemType = $('#dropdown').data('item-type');
+ var itemSource = $('#dropdown').data('item-source');
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), OC.PERMISSION_READ, function() {
+ console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type);
+ $('#linkPassText').val('');
+ $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+ });
+ }
});
$('#expirationCheckbox').live('click', function() {
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 80a22a248e6..d33de577b3d 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,10 +1,48 @@
<?php $TRANSLATIONS = array(
+"No category to add?" => "ألا توجد فئة للإضافة؟",
+"This category already exists: " => "هذه الفئة موجودة مسبقاً",
+"No categories selected for deletion." => "لم يتم اختيار فئة للحذف",
"Settings" => "تعديلات",
+"seconds ago" => "منذ ثواني",
+"1 minute ago" => "منذ دقيقة",
+"{minutes} minutes ago" => "{minutes} منذ دقائق",
+"today" => "اليوم",
+"Choose" => "اختيار",
"Cancel" => "الغاء",
+"No" => "لا",
+"Yes" => "نعم",
+"Ok" => "موافق",
+"Error" => "خطأ",
+"Error while sharing" => "حصل خطأ عند عملية المشاركة",
+"Error while unsharing" => "حصل خطأ عند عملية إزالة المشاركة",
+"Error while changing permissions" => "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
+"Shared with you and the group {group} by {owner}" => "شورك معك ومع المجموعة {group} من قبل {owner}",
+"Shared with you by {owner}" => "شورك معك من قبل {owner}",
+"Share with" => "شارك مع",
+"Share with link" => "شارك مع رابط",
+"Password protect" => "حماية كلمة السر",
"Password" => "كلمة السر",
+"Set expiration date" => "تعيين تاريخ إنتهاء الصلاحية",
+"Expiration date" => "تاريخ إنتهاء الصلاحية",
+"Share via email:" => "مشاركة عبر البريد الإلكتروني:",
+"No people found" => "لم يتم العثور على أي شخص",
+"Resharing is not allowed" => "لا يسمح بعملية إعادة المشاركة",
+"Shared in {item} with {user}" => "شورك في {item} مع {user}",
"Unshare" => "إلغاء مشاركة",
+"can edit" => "التحرير مسموح",
+"access control" => "ضبط الوصول",
+"create" => "إنشاء",
+"update" => "تحديث",
+"delete" => "حذف",
+"share" => "مشاركة",
+"Password protected" => "محمي بكلمة السر",
+"Error unsetting expiration date" => "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
+"Error setting expiration date" => "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
+"ownCloud password reset" => "إعادة تعيين كلمة سر ownCloud",
"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
"You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
+"Reset email send." => "إعادة إرسال البريد الإلكتروني.",
+"Request failed!" => "فشل الطلب",
"Username" => "إسم المستخدم",
"Request reset" => "طلب تعديل",
"Your password was reset" => "لقد تم تعديل كلمة السر",
@@ -16,9 +54,12 @@
"Apps" => "التطبيقات",
"Admin" => "مستخدم رئيسي",
"Help" => "المساعدة",
+"Access forbidden" => "التوصّل محظور",
"Cloud not found" => "لم يتم إيجاد",
"Edit categories" => "عدل الفئات",
"Add" => "أدخل",
+"Security Warning" => "تحذير أمان",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension.",
"Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
"Advanced" => "خيارات متقدمة",
"Data folder" => "مجلد المعلومات",
@@ -27,6 +68,7 @@
"Database user" => "مستخدم قاعدة البيانات",
"Database password" => "كلمة سر مستخدم قاعدة البيانات",
"Database name" => "إسم قاعدة البيانات",
+"Database tablespace" => "مساحة جدول قاعدة البيانات",
"Database host" => "خادم قاعدة البيانات",
"Finish setup" => "انهاء التعديلات",
"Sunday" => "الاحد",
@@ -50,10 +92,16 @@
"December" => "كانون الاول",
"web services under your control" => "خدمات الوب تحت تصرفك",
"Log out" => "الخروج",
+"Automatic logon rejected!" => "تم رفض تسجيل الدخول التلقائي!",
+"If you did not change your password recently, your account may be compromised!" => "قد يكون حسابك في خطر إن لم تقم بإعادة تعيين كلمة السر حديثاً",
+"Please change your password to secure your account again." => "الرجاء إعادة تعيين كلمة السر لتأمين حسابك.",
"Lost your password?" => "هل نسيت كلمة السر؟",
"remember" => "تذكر",
"Log in" => "أدخل",
"You are logged out." => "تم الخروج بنجاح.",
"prev" => "السابق",
-"next" => "التالي"
+"next" => "التالي",
+"Security Warning!" => "تحذير أمان!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "الرجاء التحقق من كلمة السر. <br/>من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى.",
+"Verify" => "تحقيق"
);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index cf7cdfb7c94..f98922f8f38 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -33,7 +33,7 @@
"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
"Error" => "Error",
"The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
-"The required file {file} is not installed!" => "El figtxer requerit {file} no està instal·lat!",
+"The required file {file} is not installed!" => "El fitxer requerit {file} no està instal·lat!",
"Error while sharing" => "Error en compartir",
"Error while unsharing" => "Error en deixar de compartir",
"Error while changing permissions" => "Error en canviar els permisos",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 2798b22830f..a792e1d9bae 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,15 +1,27 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Bruger %s delte en fil med dig",
+"User %s shared a folder with you" => "Bruger %s delte en mappe med dig",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Bruger %s delte mappe \"%s\" med dig. Det kan hentes her: %s",
+"Category type not provided." => "Kategori typen ikke er fastsat.",
"No category to add?" => "Ingen kategori at tilføje?",
"This category already exists: " => "Denne kategori eksisterer allerede: ",
+"Object type not provided." => "Object type ikke er fastsat.",
+"%s ID not provided." => "%s ID ikke oplyst.",
+"Error adding %s to favorites." => "Fejl ved tilføjelse af %s til favoritter.",
"No categories selected for deletion." => "Ingen kategorier valgt",
+"Error removing %s from favorites." => "Fejl ved fjernelse af %s fra favoritter.",
"Settings" => "Indstillinger",
"seconds ago" => "sekunder siden",
"1 minute ago" => "1 minut siden",
"{minutes} minutes ago" => "{minutes} minutter siden",
+"1 hour ago" => "1 time siden",
+"{hours} hours ago" => "{hours} timer siden",
"today" => "i dag",
"yesterday" => "i går",
"{days} days ago" => "{days} dage siden",
"last month" => "sidste måned",
+"{months} months ago" => "{months} måneder siden",
"months ago" => "måneder siden",
"last year" => "sidste år",
"years ago" => "år siden",
@@ -18,7 +30,10 @@
"No" => "Nej",
"Yes" => "Ja",
"Ok" => "OK",
+"The object type is not specified." => "Objekttypen er ikke angivet.",
"Error" => "Fejl",
+"The app name is not specified." => "Den app navn er ikke angivet.",
+"The required file {file} is not installed!" => "Den krævede fil {file} er ikke installeret!",
"Error while sharing" => "Fejl under deling",
"Error while unsharing" => "Fejl under annullering af deling",
"Error while changing permissions" => "Fejl under justering af rettigheder",
@@ -28,6 +43,8 @@
"Share with link" => "Del med link",
"Password protect" => "Beskyt med adgangskode",
"Password" => "Kodeord",
+"Email link to person" => "E-mail link til person",
+"Send" => "Send",
"Set expiration date" => "Vælg udløbsdato",
"Expiration date" => "Udløbsdato",
"Share via email:" => "Del via email:",
@@ -44,9 +61,13 @@
"Password protected" => "Beskyttet med adgangskode",
"Error unsetting expiration date" => "Fejl ved fjernelse af udløbsdato",
"Error setting expiration date" => "Fejl under sætning af udløbsdato",
+"Sending ..." => "Sender ...",
+"Email sent" => "E-mail afsendt",
"ownCloud password reset" => "Nulstil ownCloud kodeord",
"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
+"Reset email send." => "Reset-mail afsendt.",
+"Request failed!" => "Anmodningen mislykkedes!",
"Username" => "Brugernavn",
"Request reset" => "Anmod om nulstilling",
"Your password was reset" => "Dit kodeord blev nulstillet",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 5ad16273fb9..c5867eda8c3 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Dich freigegeben",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis für Dich freigegeben",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
"This category already exists: " => "Kategorie existiert bereits:",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index e32068f6db2..ed0bc0e0ffb 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,8 +1,8 @@
<?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s teilt eine Datei mit dir",
-"User %s shared a folder with you" => "Der Nutzer %s teilt einen Ordner mit dir",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt die Datei \"%s\" mit dir. Du kannst diese hier herunterladen: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt den Ornder \"%s\" mit dir. Du kannst diesen hier herunterladen: %s",
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Sie freigegeben",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis für Sie freigegeben",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
"This category already exists: " => "Kategorie existiert bereits:",
@@ -43,7 +43,7 @@
"Share with link" => "Über einen Link freigeben",
"Password protect" => "Passwortschutz",
"Password" => "Passwort",
-"Email link to person" => "Link per Mail an Person schicken",
+"Email link to person" => "Link per E-Mail verschicken",
"Send" => "Senden",
"Set expiration date" => "Setze ein Ablaufdatum",
"Expiration date" => "Ablaufdatum",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index e01de9fdc2c..d8a5d7aef51 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Ο χρήστης %s διαμοιράστηκε ένα αρχείο με εσάς",
+"User %s shared a folder with you" => "Ο χρήστης %s διαμοιράστηκε ένα φάκελο με εσάς",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Ο χρήστης %s διαμοιράστηκε το αρχείο \"%s\" μαζί σας. Είναι διαθέσιμο για λήψη εδώ: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Ο χρήστης %s διαμοιράστηκε τον φάκελο \"%s\" μαζί σας. Είναι διαθέσιμος για λήψη εδώ: %s",
"Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
"No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
"This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη:",
@@ -39,6 +43,8 @@
"Share with link" => "Διαμοιρασμός με σύνδεσμο",
"Password protect" => "Προστασία συνθηματικού",
"Password" => "Συνθηματικό",
+"Email link to person" => "Αποστολή συνδέσμου με email ",
+"Send" => "Αποστολή",
"Set expiration date" => "Ορισμός ημ. λήξης",
"Expiration date" => "Ημερομηνία λήξης",
"Share via email:" => "Διαμοιρασμός μέσω email:",
@@ -55,6 +61,8 @@
"Password protected" => "Προστασία με συνθηματικό",
"Error unsetting expiration date" => "Σφάλμα κατά την διαγραφή της ημ. λήξης",
"Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης",
+"Sending ..." => "Αποστολή...",
+"Email sent" => "Το Email απεστάλη ",
"ownCloud password reset" => "Επαναφορά συνθηματικού ownCloud",
"Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
"You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 7b65652d67c..a605b27ed80 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "La uzanto %s kunhavigis dosieron kun vi",
+"User %s shared a folder with you" => "La uzanto %s kunhavigis dosierujon kun vi",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosieron “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosierujon “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s",
"Category type not provided." => "Ne proviziĝis tipon de kategorio.",
"No category to add?" => "Ĉu neniu kategorio estas aldonota?",
"This category already exists: " => "Ĉi tiu kategorio jam ekzistas: ",
@@ -39,6 +43,8 @@
"Share with link" => "Kunhavigi per ligilo",
"Password protect" => "Protekti per pasvorto",
"Password" => "Pasvorto",
+"Email link to person" => "Retpoŝti la ligilon al ulo",
+"Send" => "Sendi",
"Set expiration date" => "Agordi limdaton",
"Expiration date" => "Limdato",
"Share via email:" => "Kunhavigi per retpoŝto:",
@@ -55,6 +61,8 @@
"Password protected" => "Protektita per pasvorto",
"Error unsetting expiration date" => "Eraro dum malagordado de limdato",
"Error setting expiration date" => "Eraro dum agordado de limdato",
+"Sending ..." => "Sendante...",
+"Email sent" => "La retpoŝtaĵo sendiĝis",
"ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
"Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index f02a7b0087c..3d174b327a2 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,4 +1,7 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "L'utilisateur %s a partagé un fichier avec vous",
+"User %s shared a folder with you" => "L'utilsateur %s a partagé un dossier avec vous",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'utilisateur %s a partagé le fichier \"%s\" avec vous. Vous pouvez le télécharger ici : %s",
"Category type not provided." => "Type de catégorie non spécifié.",
"No category to add?" => "Pas de catégorie à ajouter ?",
"This category already exists: " => "Cette catégorie existe déjà : ",
@@ -39,6 +42,8 @@
"Share with link" => "Partager via lien",
"Password protect" => "Protéger par un mot de passe",
"Password" => "Mot de passe",
+"Email link to person" => "Envoyez le lien par email",
+"Send" => "Envoyer",
"Set expiration date" => "Spécifier la date d'expiration",
"Expiration date" => "Date d'expiration",
"Share via email:" => "Partager via e-mail :",
@@ -55,6 +60,8 @@
"Password protected" => "Protégé par un mot de passe",
"Error unsetting expiration date" => "Un erreur est survenue pendant la suppression de la date d'expiration",
"Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration",
+"Sending ..." => "En cours d'envoi ...",
+"Email sent" => "Email envoyé",
"ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
"You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index d4ec0ab84c4..50addbd5278 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "המשתמש %s שיתף אתך קובץ",
+"User %s shared a folder with you" => "המשתמש %s שיתף אתך תיקייה",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s",
"Category type not provided." => "סוג הקטגוריה לא סופק.",
"No category to add?" => "אין קטגוריה להוספה?",
"This category already exists: " => "קטגוריה זאת כבר קיימת: ",
@@ -39,6 +43,8 @@
"Share with link" => "שיתוף עם קישור",
"Password protect" => "הגנה בססמה",
"Password" => "ססמה",
+"Email link to person" => "שליחת קישור בדוא״ל למשתמש",
+"Send" => "שליחה",
"Set expiration date" => "הגדרת תאריך תפוגה",
"Expiration date" => "תאריך התפוגה",
"Share via email:" => "שיתוף באמצעות דוא״ל:",
@@ -55,6 +61,8 @@
"Password protected" => "מוגן בססמה",
"Error unsetting expiration date" => "אירעה שגיאה בביטול תאריך התפוגה",
"Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+"Sending ..." => "מתבצעת שליחה ...",
+"Email sent" => "הודעת הדוא״ל נשלחה",
"ownCloud password reset" => "איפוס הססמה של ownCloud",
"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
"You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 251abb015f9..401baf6efa0 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,18 +1,73 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Корисникот %s сподели датотека со Вас",
+"User %s shared a folder with you" => "Корисникот %s сподели папка со Вас",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s",
+"Category type not provided." => "Не беше доставен тип на категорија.",
"No category to add?" => "Нема категорија да се додаде?",
"This category already exists: " => "Оваа категорија веќе постои:",
+"Object type not provided." => "Не беше доставен тип на објект.",
+"%s ID not provided." => "%s ID не беше доставено.",
+"Error adding %s to favorites." => "Грешка при додавање %s во омилени.",
"No categories selected for deletion." => "Не е одбрана категорија за бришење.",
+"Error removing %s from favorites." => "Грешка при бришење на %s од омилени.",
"Settings" => "Поставки",
+"seconds ago" => "пред секунди",
+"1 minute ago" => "пред 1 минута",
+"{minutes} minutes ago" => "пред {minutes} минути",
+"1 hour ago" => "пред 1 час",
+"{hours} hours ago" => "пред {hours} часови",
+"today" => "денеска",
+"yesterday" => "вчера",
+"{days} days ago" => "пред {days} денови",
+"last month" => "минатиот месец",
+"{months} months ago" => "пред {months} месеци",
+"months ago" => "пред месеци",
+"last year" => "минатата година",
+"years ago" => "пред години",
+"Choose" => "Избери",
"Cancel" => "Откажи",
"No" => "Не",
"Yes" => "Да",
"Ok" => "Во ред",
+"The object type is not specified." => "Не е специфициран типот на објект.",
"Error" => "Грешка",
+"The app name is not specified." => "Името на апликацијата не е специфицирано.",
+"The required file {file} is not installed!" => "Задолжителната датотека {file} не е инсталирана!",
+"Error while sharing" => "Грешка при споделување",
+"Error while unsharing" => "Грешка при прекин на споделување",
+"Error while changing permissions" => "Грешка при промена на привилегии",
+"Shared with you and the group {group} by {owner}" => "Споделено со Вас и групата {group} од {owner}",
+"Shared with you by {owner}" => "Споделено со Вас од {owner}",
+"Share with" => "Сподели со",
+"Share with link" => "Сподели со врска",
+"Password protect" => "Заштити со лозинка",
"Password" => "Лозинка",
+"Email link to person" => "Прати врска по е-пошта на личност",
+"Send" => "Прати",
+"Set expiration date" => "Постави рок на траење",
+"Expiration date" => "Рок на траење",
+"Share via email:" => "Сподели по е-пошта:",
+"No people found" => "Не се најдени луѓе",
+"Resharing is not allowed" => "Повторно споделување не е дозволено",
+"Shared in {item} with {user}" => "Споделено во {item} со {user}",
+"Unshare" => "Не споделувај",
+"can edit" => "може да се измени",
+"access control" => "контрола на пристап",
"create" => "креирај",
+"update" => "ажурирај",
+"delete" => "избриши",
+"share" => "сподели",
+"Password protected" => "Заштитено со лозинка",
+"Error unsetting expiration date" => "Грешка при тргање на рокот на траење",
+"Error setting expiration date" => "Грешка при поставување на рок на траење",
+"Sending ..." => "Праќање...",
+"Email sent" => "Е-порака пратена",
"ownCloud password reset" => "ресетирање на лозинка за ownCloud",
"Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
"You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
+"Reset email send." => "Порката за ресетирање на лозинка пратена.",
+"Request failed!" => "Барањето не успеа!",
"Username" => "Корисничко име",
"Request reset" => "Побарајте ресетирање",
"Your password was reset" => "Вашата лозинка беше ресетирана",
@@ -28,6 +83,10 @@
"Cloud not found" => "Облакот не е најден",
"Edit categories" => "Уреди категории",
"Add" => "Додади",
+"Security Warning" => "Безбедносно предупредување",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот.",
+"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 your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот.",
"Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
"Advanced" => "Напредно",
"Data folder" => "Фолдер со податоци",
@@ -36,6 +95,7 @@
"Database user" => "Корисник на база",
"Database password" => "Лозинка на база",
"Database name" => "Име на база",
+"Database tablespace" => "Табела во базата на податоци",
"Database host" => "Сервер со база",
"Finish setup" => "Заврши го подесувањето",
"Sunday" => "Недела",
@@ -59,10 +119,16 @@
"December" => "Декември",
"web services under your control" => "веб сервиси под Ваша контрола",
"Log out" => "Одјава",
+"Automatic logon rejected!" => "Одбиена автоматска најава!",
+"If you did not change your password recently, your account may be compromised!" => "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана",
+"Please change your password to secure your account again." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.",
"Lost your password?" => "Ја заборавивте лозинката?",
"remember" => "запамти",
"Log in" => "Најава",
"You are logged out." => "Одјавени сте.",
"prev" => "претходно",
-"next" => "следно"
+"next" => "следно",
+"Security Warning!" => "Безбедносно предупредување.",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно.",
+"Verify" => "Потврди"
);
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 89bb322773d..c3f5c887658 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Gebruiker %s deelde een bestand met u",
+"User %s shared a folder with you" => "Gebruiker %s deelde een map met u",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Gebruiker %s deelde bestand \"%s\" met u. Het is hier te downloaden: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Gebruiker %s deelde de map \"%s\" met u. De map is hier beschikbaar voor download: %s",
"Category type not provided." => "Categorie type niet opgegeven.",
"No category to add?" => "Geen categorie toevoegen?",
"This category already exists: " => "Deze categorie bestaat al.",
@@ -39,6 +43,8 @@
"Share with link" => "Deel met link",
"Password protect" => "Wachtwoord beveiliging",
"Password" => "Wachtwoord",
+"Email link to person" => "E-mail link naar persoon",
+"Send" => "Versturen",
"Set expiration date" => "Stel vervaldatum in",
"Expiration date" => "Vervaldatum",
"Share via email:" => "Deel via email:",
@@ -55,6 +61,8 @@
"Password protected" => "Wachtwoord beveiligd",
"Error unsetting expiration date" => "Fout tijdens het verwijderen van de verval datum",
"Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum",
+"Sending ..." => "Versturen ...",
+"Email sent" => "E-mail verzonden",
"ownCloud password reset" => "ownCloud wachtwoord herstellen",
"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index b780e546194..1208aec5a53 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Użytkownik %s współdzieli plik z tobą",
+"User %s shared a folder with you" => "Uzytkownik %s wspóldzieli folder z toba",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Użytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s",
"Category type not provided." => "Typ kategorii nie podany.",
"No category to add?" => "Brak kategorii",
"This category already exists: " => "Ta kategoria już istnieje",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 24017d39819..a2bfcf4f882 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "O utilizador %s partilhou um ficheiro consigo.",
+"User %s shared a folder with you" => "O utilizador %s partilhou uma pasta consigo.",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s",
"Category type not provided." => "Tipo de categoria não fornecido",
"No category to add?" => "Nenhuma categoria para adicionar?",
"This category already exists: " => "Esta categoria já existe:",
@@ -39,6 +43,8 @@
"Share with link" => "Partilhar com link",
"Password protect" => "Proteger com palavra-passe",
"Password" => "Palavra chave",
+"Email link to person" => "Enviar o link por e-mail",
+"Send" => "Enviar",
"Set expiration date" => "Especificar data de expiração",
"Expiration date" => "Data de expiração",
"Share via email:" => "Partilhar via email:",
@@ -55,6 +61,8 @@
"Password protected" => "Protegido com palavra-passe",
"Error unsetting expiration date" => "Erro ao retirar a data de expiração",
"Error setting expiration date" => "Erro ao aplicar a data de expiração",
+"Sending ..." => "A Enviar...",
+"Email sent" => "E-mail enviado com sucesso!",
"ownCloud password reset" => "Reposição da password ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
"You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 7dea4062809..c18fe245c9e 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Пользователь %s открыл Вам доступ к файлу",
+"User %s shared a folder with you" => "Пользователь %s открыл Вам доступ к папке",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к папке \"%s\". Она доступена для загрузки здесь: %s",
"Category type not provided." => "Тип категории не предоставлен.",
"No category to add?" => "Нет категории для добавления?",
"This category already exists: " => "Эта категория уже существует:",
@@ -39,6 +43,8 @@
"Share with link" => "Опубликовать с ссылкой",
"Password protect" => "Защитить паролем",
"Password" => "Пароль",
+"Email link to person" => "Ссылка на адрес электронной почты",
+"Send" => "Отправить",
"Set expiration date" => "Установить срок действия",
"Expiration date" => "Дата истечения срока действия",
"Share via email:" => "Сделать общедоступным посредством email:",
@@ -55,6 +61,8 @@
"Password protected" => "Пароль защищен",
"Error unsetting expiration date" => "Ошибка при отключении даты истечения срока действия",
"Error setting expiration date" => "Ошибка при установке даты истечения срока действия",
+"Sending ..." => "Отправка ...",
+"Email sent" => "Письмо отправлено",
"ownCloud password reset" => "Переназначение пароля",
"Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}",
"You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2aa4193263d..0ee2eb03b3c 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Uporanik %s je dal datoteko v souporabo z vami",
+"User %s shared a folder with you" => "Uporanik %s je dal mapo v souporabo z vami",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s",
"Category type not provided." => "Vrsta kategorije ni podana.",
"No category to add?" => "Ni kategorije za dodajanje?",
"This category already exists: " => "Ta kategorija že obstaja:",
@@ -39,6 +43,8 @@
"Share with link" => "Omogoči souporabo s povezavo",
"Password protect" => "Zaščiti z geslom",
"Password" => "Geslo",
+"Email link to person" => "Posreduj povezavo po e-pošti",
+"Send" => "Pošlji",
"Set expiration date" => "Nastavi datum preteka",
"Expiration date" => "Datum preteka",
"Share via email:" => "Souporaba preko elektronske pošte:",
@@ -55,6 +61,8 @@
"Password protected" => "Zaščiteno z geslom",
"Error unsetting expiration date" => "Napaka brisanja datuma preteka",
"Error setting expiration date" => "Napaka med nastavljanjem datuma preteka",
+"Sending ..." => "Pošiljam ...",
+"Email sent" => "E-pošta je bila poslana",
"ownCloud password reset" => "Ponastavitev gesla ownCloud",
"Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}",
"You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index a83382904d3..64b108ca1dd 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "用户 %s 与您共享了一个文件",
+"User %s shared a folder with you" => "用户 %s 与您共享了一个文件夹",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件\"%s\"。文件下载地址：%s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件夹\"%s\"。文件夹下载地址：%s",
"Category type not provided." => "未提供分类类型。",
"No category to add?" => "没有可添加分类？",
"This category already exists: " => "此分类已存在: ",
@@ -39,6 +43,7 @@
"Share with link" => "共享链接",
"Password protect" => "密码保护",
"Password" => "密码",
+"Send" => "发送",
"Set expiration date" => "设置过期日期",
"Expiration date" => "过期日期",
"Share via email:" => "通过Email共享",
@@ -55,6 +60,8 @@
"Password protected" => "密码已受保护",
"Error unsetting expiration date" => "取消设置过期日期时出错",
"Error setting expiration date" => "设置过期日期时出错",
+"Sending ..." => "正在发送...",
+"Email sent" => "邮件已发送",
"ownCloud password reset" => "重置 ownCloud 密码",
"Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
"You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 523520dc754..e64b16d3b83 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -43,7 +43,7 @@ class OC_Core_LostPassword_Controller {
$tmpl->assign('link', $link, false);
$msg = $tmpl->fetchPage();
$l = OC_L10N::get('core');
- $from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
+ $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
echo('Mailsent');
diff --git a/core/templates/login.php b/core/templates/login.php
index 153d1b50a30..10093baabf7 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,32 +1,50 @@
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
<form method="post">
- <fieldset>
- <?php if(!empty($_['redirect_url'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect_url'].'" />'; } ?>
- <ul>
- <?php if(isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
- <li class="errors">
- <?php echo $l->t('Automatic logon rejected!'); ?><br>
- <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small><br>
- <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
- </li>
- <?php endif; ?>
- <?php if(isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
- <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>"><li class="errors">
- <?php echo $l->t('Lost your password?'); ?>
- </li></a>
- <?php endif; ?>
- </ul>
- <p class="infield grouptop">
- <input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required />
- <label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
- <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
- </p>
- <p class="infield groupbottom">
- <input type="password" name="password" id="password" value="" required<?php echo $_['user_autofocus']?'':' autofocus'; ?> />
- <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
- <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
- </p>
- <input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
- <input type="submit" id="submit" class="login primary" value="<?php echo $l->t( 'Log in' ); ?>" />
- </fieldset>
+ <fieldset>
+ <?php if (!empty($_['redirect_url'])) {
+ echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
+ } ?>
+ <ul>
+ <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
+ <li class="errors">
+ <?php echo $l->t('Automatic logon rejected!'); ?><br>
+ <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
+ <br>
+ <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
+ </li>
+ <?php endif; ?>
+ <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
+ <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
+ <li class="errors">
+ <?php echo $l->t('Lost your password?'); ?>
+ </li>
+ </a>
+ <?php endif; ?>
+ </ul>
+ <p class="infield grouptop">
+ <input type="text" name="user" id="user"
+ value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
+ autocomplete="on" required/>
+ <label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
+ <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
+ </p>
+
+ <p class="infield groupbottom">
+ <input type="password" name="password" id="password" value=""
+ required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
+ <label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
+ <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+ </p>
+ <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
+ for="remember_login"><?php echo $l->t('remember'); ?></label>
+ <input type="hidden" name="timezone-offset" id="timezone-offset"/>
+ <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
+ </fieldset>
</form>
+<script>
+ $(document).ready(function () {
+ var visitortimezone = (-new Date().getTimezoneOffset() / 60);
+ $('#timezone-offset').val(visitortimezone);
+ });
+
+</script>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 18:10:56 +0000