summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/css/share.css17
-rw-r--r--core/css/styles.css1
-rw-r--r--core/img/actions/triangle-n.pngbin470 -> 223 bytes
-rw-r--r--core/img/actions/triangle-n.svg20
-rw-r--r--core/img/actions/triangle-s.pngbin515 -> 232 bytes
-rw-r--r--core/img/actions/triangle-s.svg24
-rw-r--r--core/js/share.js16
-rw-r--r--core/l10n/ca.php2
-rw-r--r--core/l10n/fa.php10
-rw-r--r--core/l10n/ka.php12
-rw-r--r--core/l10n/ka_GE.php18
11 files changed, 74 insertions, 46 deletions
diff --git a/core/css/share.css b/core/css/share.css
index e806d25982e..2480a571ae5 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -24,6 +24,18 @@
#shareWithList li {
padding-top:.1em;
}
+
+ #shareWithList li:first-child {
+ white-space:normal;
+ }
+
+ #shareWithList .cruds {
+ margin-left:-10px;
+ }
+
+#shareWithList .unshare img, #shareWithList .showCruds img {
+ vertical-align:text-bottom; /* properly align icons */
+}
#dropdown label {
font-weight:400;
@@ -43,6 +55,7 @@
float:right;
opacity:.5;
padding:.3em 0 0 .3em !important;
+ margin-top:-5px;
}
#link {
@@ -75,4 +88,6 @@
a.showCruds:hover,a.unshare:hover {
opacity:1;
- } \ No newline at end of file
+ }
+
+.reshare { white-space:normal; } /* fix shared by text going out of box */
diff --git a/core/css/styles.css b/core/css/styles.css
index 0c16b36873f..61243237bc1 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -139,6 +139,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
#body-login div.buttons { text-align:center; }
#body-login p.info { width:22em; text-align:center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
#body-login p.info a { font-weight:bold; color:#777; }
+#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 */
#login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
#login form { width:22em; margin:2em auto 2em; padding:0; }
diff --git a/core/img/actions/triangle-n.png b/core/img/actions/triangle-n.png
index b0d7183caab..14825f70114 100644
--- a/core/img/actions/triangle-n.png
+++ b/core/img/actions/triangle-n.png
Binary files differ
diff --git a/core/img/actions/triangle-n.svg b/core/img/actions/triangle-n.svg
index 35658631111..e8d70fa8ce3 100644
--- a/core/img/actions/triangle-n.svg
+++ b/core/img/actions/triangle-n.svg
@@ -57,10 +57,10 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
- inkscape:window-width="1920"
- inkscape:window-height="1025"
- inkscape:window-x="-2"
- inkscape:window-y="-3"
+ inkscape:window-width="1280"
+ inkscape:window-height="773"
+ inkscape:window-x="0"
+ inkscape:window-y="-1"
inkscape:window-maximized="1" />
<metadata
id="metadata6082">
@@ -79,14 +79,10 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
+ 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:#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"
+ d="M 12,12 8,3.9999999 3.9999999,11.989 z"
+ id="path3716"
inkscape:connector-curvature="0"
- d="M 14.5,15 1.5,15 8,3 14.5,15 z"
- id="path2843-0-1-6-6"
- style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- <path
- inkscape:connector-curvature="0"
- d="m 14.5,13.49996 -13,0 6.49999,-12 6.50001,12 z"
- id="path2843-39-5-5"
- style="opacity:0.7;color:#000000;fill:url(#linearGradient7308);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ sodipodi:nodetypes="cccc" />
</g>
</svg>
diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
index 53590a2197b..f36faef2b8a 100644
--- a/core/img/actions/triangle-s.png
+++ b/core/img/actions/triangle-s.png
Binary files differ
diff --git a/core/img/actions/triangle-s.svg b/core/img/actions/triangle-s.svg
index f899300bbca..396c61e01e2 100644
--- a/core/img/actions/triangle-s.svg
+++ b/core/img/actions/triangle-s.svg
@@ -14,7 +14,7 @@
height="16px"
id="svg6077"
version="1.1"
- inkscape:version="0.48.2 r9819"
+ inkscape:version="0.48.3.1 r9886"
sodipodi:docname="triangle-s.svg"
inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/triangle-s.png"
inkscape:export-xdpi="90"
@@ -57,10 +57,10 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
- inkscape:window-width="1600"
- inkscape:window-height="845"
- inkscape:window-x="-2"
- inkscape:window-y="-3"
+ inkscape:window-width="1280"
+ inkscape:window-height="773"
+ inkscape:window-x="0"
+ inkscape:window-y="-1"
inkscape:window-maximized="1" />
<metadata
id="metadata6082">
@@ -70,7 +70,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -79,14 +79,10 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
+ 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:#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"
+ d="M 4,3.9999999 8,12 12,4.0109999 z"
+ id="path3716"
inkscape:connector-curvature="0"
- d="M 14.5,3 1.5,3 8,15 14.5,3 z"
- id="path2843-0-1-6-6"
- style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- <path
- inkscape:connector-curvature="0"
- d="m 14.5,1.49996 -13,0 6.49999,12 6.50001,-12 z"
- id="path2843-39-5-5"
- style="opacity:0.7;color:#000000;fill:url(#linearGradient7308);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ sodipodi:nodetypes="cccc" />
</g>
</svg>
diff --git a/core/js/share.js b/core/js/share.js
index 6d1c3954044..328d57928ec 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -24,9 +24,9 @@ OC.Share={
var file = $('tr').filterAttr('data-file', OC.basename(item));
if (file.length > 0) {
var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
- action.find('img').attr('src', image);
+ var img = action.find('img').attr('src', image);
action.addClass('permanent');
- action.html(t('core', 'Shared'));
+ action.html(' '+t('core', 'Shared')).prepend(img);
}
var dir = $('#dir').val();
if (dir.length > 1) {
@@ -40,7 +40,7 @@ OC.Share={
if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
img.attr('src', image);
action.addClass('permanent');
- action.html(t('core', 'Shared'));
+ action.html(' '+t('core', 'Shared')).prepend(img);
}
}
last = path;
@@ -84,13 +84,13 @@ OC.Share={
$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
} else {
var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
- action.find('img').attr('src', image);
+ var img = action.find('img').attr('src', image);
if (shares) {
action.addClass('permanent');
- action.html(t('core', 'Shared'));
+ action.html(' '+t('core', 'Shared')).prepend(img);
} else {
action.removeClass('permanent');
- action.html(t('core', 'Share'));
+ action.html(' '+t('core', 'Share')).prepend(img);
}
}
if (shares) {
@@ -186,8 +186,8 @@ OC.Share={
html += '</div>';
html += '</div>';
html += '<form id="emailPrivateLink" >';
- html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
- html += '<input id="emailButton" style="display:none; float:right;" type="submit" value="'+t('core', 'Send')+'" />';
+ html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
+ html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
html += '</form>';
}
html += '<div id="expiration">';
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d260241c4d6..3837ceb0f92 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -85,7 +85,7 @@
"Sending ..." => "Enviant...",
"Email sent" => "El correu electrónic s'ha enviat",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara sou redireccionat a ownCloud.",
+"The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
"ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
"Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
"You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 10a57962f64..2420ee67df5 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -5,6 +5,7 @@
"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: %s" => "این دسته هم اکنون وجود دارد: %s",
"Object type not provided." => "نوع شی ارائه نشده است.",
"%s ID not provided." => "شناسه %s ارائه نشده است.",
"Error adding %s to favorites." => "خطای اضافه کردن %s به علاقه مندی ها.",
@@ -52,6 +53,7 @@
"Error" => "خطا",
"The app name is not specified." => "نام برنامه تعیین نشده است.",
"The required file {file} is not installed!" => "پرونده { پرونده} درخواست شده نصب نشده است !",
+"Shared" => "اشتراک گذاشته شده",
"Share" => "اشتراک‌گزاری",
"Error while sharing" => "خطا درحال به اشتراک گذاشتن",
"Error while unsharing" => "خطا درحال لغو اشتراک",
@@ -63,6 +65,7 @@
"Password protect" => "نگهداری کردن رمز عبور",
"Password" => "گذرواژه",
"Email link to person" => "پیوند ایمیل برای شخص.",
+"Send" => "ارسال",
"Set expiration date" => "تنظیم تاریخ انقضا",
"Expiration date" => "تاریخ انقضا",
"Share via email:" => "از طریق ایمیل به اشتراک بگذارید :",
@@ -79,6 +82,10 @@
"Password protected" => "نگهداری از رمز عبور",
"Error unsetting expiration date" => "خطا در تنظیم نکردن تاریخ انقضا ",
"Error setting expiration date" => "خطا در تنظیم تاریخ انقضا",
+"Sending ..." => "درحال ارسال ...",
+"Email sent" => "ایمیل ارسال شد",
+"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</a> گزارش نمایید.",
+"The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
"ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
"You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
@@ -122,5 +129,6 @@
"remember" => "بیاد آوری",
"Log in" => "ورود",
"prev" => "بازگشت",
-"next" => "بعدی"
+"next" => "بعدی",
+"Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
);
diff --git a/core/l10n/ka.php b/core/l10n/ka.php
new file mode 100644
index 00000000000..b8deeb1e550
--- /dev/null
+++ b/core/l10n/ka.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"seconds ago" => "წამის წინ",
+"1 minute ago" => "1 წუთის წინ",
+"1 hour ago" => "1 საათის წინ",
+"today" => "დღეს",
+"yesterday" => "გუშინ",
+"Password" => "პაროლი",
+"Personal" => "პერსონა",
+"Users" => "მომხმარებლები",
+"Admin" => "ადმინისტრატორი",
+"Help" => "შველა"
+);
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 731a3534558..4cdada58d90 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -48,7 +48,7 @@
"Set expiration date" => "მიუთითე ვადის გასვლის დრო",
"Expiration date" => "ვადის გასვლის დრო",
"Share via email:" => "გააზიარე მეილზე",
-"No people found" => "გვერდი არ არის ნაპოვნი",
+"No people found" => "მომხმარებელი არ არის ნაპოვნი",
"Resharing is not allowed" => "მეორეჯერ გაზიარება არ არის დაშვებული",
"Unshare" => "გაზიარების მოხსნა",
"can edit" => "შეგიძლია შეცვლა",
@@ -64,11 +64,11 @@
"Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
"You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
"Username" => "მომხმარებელი",
-"Request reset" => "რესეტის მოთხოვნა",
+"Request reset" => "პაროლის შეცვლის მოთხოვნა",
"Your password was reset" => "თქვენი პაროლი შეცვლილია",
"To login page" => "შესვლის გვერდზე",
"New password" => "ახალი პაროლი",
-"Reset password" => "პაროლის რესეტი",
+"Reset password" => "პაროლის შეცვლა",
"Personal" => "პირადი",
"Users" => "მომხმარებლები",
"Apps" => "აპლიკაციები",
@@ -81,16 +81,16 @@
"Security Warning" => "უსაფრთხოების გაფრთხილება",
"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." => "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს.",
-"Create an <strong>admin account</strong>" => "შექმენი ადმინ ექაუნტი",
+"Create an <strong>admin account</strong>" => "შექმენი <strong>ადმინ ექაუნტი</strong>",
"Advanced" => "Advanced",
"Data folder" => "მონაცემთა საქაღალდე",
-"Configure the database" => "ბაზის კონფიგურირება",
+"Configure the database" => "მონაცემთა ბაზის კონფიგურირება",
"will be used" => "გამოყენებული იქნება",
-"Database user" => "ბაზის მომხმარებელი",
-"Database password" => "ბაზის პაროლი",
-"Database name" => "ბაზის სახელი",
+"Database user" => "მონაცემთა ბაზის მომხმარებელი",
+"Database password" => "მონაცემთა ბაზის პაროლი",
+"Database name" => "მონაცემთა ბაზის სახელი",
"Database tablespace" => "ბაზის ცხრილის ზომა",
-"Database host" => "ბაზის ჰოსტი",
+"Database host" => "მონაცემთა ბაზის ჰოსტი",
"Finish setup" => "კონფიგურაციის დასრულება",
"web services under your control" => "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები",
"Log out" => "გამოსვლა",
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 10:12:07 +0000