summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/ajax/share.php2
-rw-r--r--core/css/apps.css4
-rw-r--r--core/css/styles.css5
-rw-r--r--core/js/oc-dialogs.js2
-rw-r--r--core/l10n/ady.php9
-rw-r--r--core/l10n/de.php2
-rw-r--r--core/l10n/de_DE.php2
-rw-r--r--core/l10n/fi_FI.php2
-rw-r--r--core/l10n/gl.php2
-rw-r--r--core/l10n/lt_LT.php2
-rw-r--r--core/l10n/mk.php26
-rw-r--r--core/l10n/pt_BR.php2
-rw-r--r--core/templates/layout.base.php1
-rw-r--r--core/templates/layout.guest.php1
-rw-r--r--core/templates/layout.user.php1
15 files changed, 56 insertions, 7 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 1166ea3198a..dbad8f2e971 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -293,7 +293,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
while ($count < 15 && count($users) == $limit) {
$limit = 15 - $count;
if ($sharePolicy == 'groups_only') {
- $users = OC_Group::DisplayNamesInGroups($groups, $_GET['search'], $limit, $offset);
+ $users = OC_Group::DisplayNamesInGroups($usergroups, $_GET['search'], $limit, $offset);
} else {
$users = OC_User::getDisplayNames($_GET['search'], $limit, $offset);
}
diff --git a/core/css/apps.css b/core/css/apps.css
index 49fb189f384..f68f53d6999 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -104,8 +104,8 @@
padding-left: 32px;
}
#app-navigation > .with-icon ul li > a {
- padding-left: 48px;
- background-position: 24px center;
+ padding-left: 68px;
+ background-position: 44px center;
}
#app-navigation .open {
diff --git a/core/css/styles.css b/core/css/styles.css
index a1ecd123983..728fd47bc9f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -254,6 +254,8 @@ input[type="submit"].enabled {
}
#body-login p.info a {
font-weight: bold;
+ padding: 13px;
+ margin: -13px;
}
#body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */
@@ -432,7 +434,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
padding: 10px;
color: #d2322d;
background-color: rgba(0,0,0,.3);
- text-align: center;
+ text-align: left;
border-radius: 3px;
cursor: default;
}
@@ -467,7 +469,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
}
#body-login .warning {
margin: 0 7px 5px;
- font-weight: bold;
}
#body-login .warning legend {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index ac37b109e76..e5e9f6dbb7d 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -294,7 +294,7 @@ var OCdialogs = {
conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate));
}
var path = getPathForPreview(original.name);
- lazyLoadPreview(path, original.type, function(previewpath){
+ lazyLoadPreview(path, original.mime, function(previewpath){
conflict.find('.original .icon').css('background-image','url('+previewpath+')');
}, 96, 96);
getCroppedPreview(replacement).then(
diff --git a/core/l10n/ady.php b/core/l10n/ady.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/ady.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%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("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 7e292adcf39..d0513ea0b7c 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -157,6 +157,8 @@ $TRANSLATIONS = array(
"Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!",
"Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.",
+"Server side authentication failed!" => "Serverseitige Authentifizierung fehlgeschlagen!",
+"Please contact your administrator." => "Bitte kontaktiere Deinen Administrator.",
"Lost your password?" => "Passwort vergessen?",
"remember" => "merken",
"Log in" => "Einloggen",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 95519c7d412..2dddea5e551 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -157,6 +157,8 @@ $TRANSLATIONS = array(
"Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
"Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
+"Server side authentication failed!" => "Serverseitige Authentifizierung fehlgeschlagen!",
+"Please contact your administrator." => "Bitte kontaktieren Sie Ihren Administrator.",
"Lost your password?" => "Passwort vergessen?",
"remember" => "merken",
"Log in" => "Einloggen",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index c6c9f09e1dd..62a8ec294ef 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -146,6 +146,8 @@ $TRANSLATIONS = array(
"Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
"If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
"Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.",
+"Server side authentication failed!" => "Palvelimen puoleinen tunnistautuminen epäonnistui!",
+"Please contact your administrator." => "Ota yhteys ylläpitäjään.",
"Lost your password?" => "Unohditko salasanasi?",
"remember" => "muista",
"Log in" => "Kirjaudu sisään",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 3325a894f48..531788f1712 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -157,6 +157,8 @@ $TRANSLATIONS = array(
"Automatic logon rejected!" => "Rexeitouse a entrada automática",
"If you did not change your password recently, your account may be compromised!" => "Se non fixo recentemente cambios de contrasinal é posíbel que a súa conta estea comprometida!",
"Please change your password to secure your account again." => "Cambie de novo o seu contrasinal para asegurar a súa conta.",
+"Server side authentication failed!" => "A autenticación fracasou do lado do servidor!",
+"Please contact your administrator." => "Contacte co administrador.",
"Lost your password?" => "Perdeu o contrasinal?",
"remember" => "lembrar",
"Log in" => "Conectar",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 7d3ce9bec6f..f25b8ab762f 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -128,6 +128,7 @@ $TRANSLATIONS = array(
"Help" => "Pagalba",
"Access forbidden" => "Priėjimas draudžiamas",
"Cloud not found" => "Negalima rasti",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
"The share will expire on %s.\n\n" => "Bendrinimo laikas baigsis %s.\n",
"Cheers!" => "Sveikinimai!",
"Edit categories" => "Redaguoti kategorijas",
@@ -160,6 +161,7 @@ $TRANSLATIONS = array(
"remember" => "prisiminti",
"Log in" => "Prisijungti",
"Alternative Logins" => "Alternatyvūs prisijungimai",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>",
"The share will expire on %s.<br><br>" => "Bendrinimo laikas baigsis %s.<br><br>",
"Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
);
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index dffd20ab3bb..e5743896521 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,13 +1,17 @@
<?php
$TRANSLATIONS = array(
"group" => "група",
+"Updated database" => "Базата е надградена",
+"Updated filecache" => "Кешот е надграден",
"Category type not provided." => "Не беше доставен тип на категорија.",
"No category to add?" => "Нема категорија да се додаде?",
+"This category already exists: %s" => "Оваа категорија веќе постои: %s",
"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 од омилени.",
+"Invalid image" => "Невалидна фотографија",
"Sunday" => "Недела",
"Monday" => "Понеделник",
"Tuesday" => "Вторник",
@@ -45,10 +49,15 @@ $TRANSLATIONS = array(
"Ok" => "Во ред",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Откажи",
+"Continue" => "Продолжи",
+"(all selected)" => "(сите одбрани)",
+"({count} selected)" => "({count} одбраните)",
+"Error loading file exists template" => "Грешка при вчитување на датотеката, шаблонот постои ",
"The object type is not specified." => "Не е специфициран типот на објект.",
"Error" => "Грешка",
"The app name is not specified." => "Името на апликацијата не е специфицирано.",
"The required file {file} is not installed!" => "Задолжителната датотека {file} не е инсталирана!",
+"Shared" => "Споделен",
"Share" => "Сподели",
"Error while sharing" => "Грешка при споделување",
"Error while unsharing" => "Грешка при прекин на споделување",
@@ -59,6 +68,7 @@ $TRANSLATIONS = array(
"Share with link" => "Сподели со врска",
"Password protect" => "Заштити со лозинка",
"Password" => "Лозинка",
+"Allow Public Upload" => "Дозволи јавен аплоуд",
"Email link to person" => "Прати врска по е-пошта на личност",
"Send" => "Прати",
"Set expiration date" => "Постави рок на траење",
@@ -68,6 +78,7 @@ $TRANSLATIONS = array(
"Resharing is not allowed" => "Повторно споделување не е дозволено",
"Shared in {item} with {user}" => "Споделено во {item} со {user}",
"Unshare" => "Не споделувај",
+"notify user by email" => "извести го корисникот преку електронска пошта",
"can edit" => "може да се измени",
"access control" => "контрола на пристап",
"create" => "креирај",
@@ -80,9 +91,13 @@ $TRANSLATIONS = array(
"Sending ..." => "Праќање...",
"Email sent" => "Е-порака пратена",
"Warning" => "Предупредување",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Надградбата беше неуспешна. Ве молиме пријавете го овој проблем на <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
+"%s password reset" => "%s ресетирање на лозинката",
"Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
"You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
"Username" => "Корисничко име",
+"Yes, I really want to reset my password now" => "Да, јас сега навистина сакам да ја поништам својата лозинка",
"Request reset" => "Побарајте ресетирање",
"Your password was reset" => "Вашата лозинка беше ресетирана",
"To login page" => "Кон страницата за најава",
@@ -95,11 +110,16 @@ $TRANSLATIONS = array(
"Help" => "Помош",
"Access forbidden" => "Забранет пристап",
"Cloud not found" => "Облакот не е најден",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здраво,\n\nСамо да ве известам дека %s shared %s with you.\nView it: %s\n\n",
+"The share will expire on %s.\n\n" => "Споделувањето ќе заврши на %s.\n\n",
+"Cheers!" => "Поздрав!",
"Edit categories" => "Уреди категории",
"Add" => "Додади",
"Security Warning" => "Безбедносно предупредување",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
"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 files are probably accessible from the internet because the .htaccess file does not work." => "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
"Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
"Advanced" => "Напредно",
"Data folder" => "Фолдер со податоци",
@@ -111,12 +131,16 @@ $TRANSLATIONS = array(
"Database tablespace" => "Табела во базата на податоци",
"Database host" => "Сервер со база",
"Finish setup" => "Заврши го подесувањето",
+"Finishing …" => "Завршувам ...",
"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." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.",
+"Please contact your administrator." => "Ве молиме контактирајте го вашиот администратор.",
"Lost your password?" => "Ја заборавивте лозинката?",
"remember" => "запамти",
-"Log in" => "Најава"
+"Log in" => "Најава",
+"Alternative Logins" => "Алтернативни најавувања",
+"Updating ownCloud to version %s, this may take a while." => "Надградбата на ownCloud на верзијата %s, може да потрае."
);
$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index fc43814ae00..14e92921f4e 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -157,6 +157,8 @@ $TRANSLATIONS = array(
"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
"Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
+"Server side authentication failed!" => "Autenticação do servidor falhou!",
+"Please contact your administrator." => "Por favor, contate o administrador.",
"Lost your password?" => "Esqueceu sua senha?",
"remember" => "lembrar",
"Log in" => "Fazer login",
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index ea10c3042b5..8caa9a0bbea 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -11,6 +11,7 @@
<?php p($theme->getTitle()); ?>
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta name="viewport" content="width=device-width; initial-scale=1.0;">
<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
<?php foreach ($_['cssfiles'] as $cssfile): ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 9c9eb63382f..cecd97ace27 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -11,6 +11,7 @@
<?php p($theme->getTitle()); ?>
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta name="viewport" content="width=device-width; initial-scale=1.0;">
<meta name="apple-itunes-app" content="app-id=543672169">
<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index fcca43624fe..39cc43fc465 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -14,6 +14,7 @@
</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width; initial-scale=1.0;">
<meta name="apple-itunes-app" content="app-id=543672169">
<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 17:02:52 +0000