Merge master into oc_preview

5 files changed, 45 insertions, 14 deletions

diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index a2d1b20d3a5..c25446808ea 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -103,3 +103,10 @@ ul.multiselectoptions > li.creator > input {
 	padding: 5px;
 	margin: -5px;
 }
+
+.ie8 div.multiselect span:first-child {
+	display:block;
+	position:relative;
+	width: 90%;
+	margin-right:-1px;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index 76eb942364d..016f9ba2b61 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -390,7 +390,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 
 
 /* Warnings and errors are the same */
-.warning, .update, .error {
+#body-login .warning, #body-login .update, #body-login .error {
 	display: block;
 	padding: 10px;
 	color: #dd3b3b;
@@ -402,6 +402,16 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 	border-radius: 5px;
 	cursor: default;
 }
+
+#body-user .warning, #body-settings .warning {
+        margin-top: 8px;
+        padding: 5px;
+        background: #fdd;
+        -webkit-border-radius: 3px;
+        -moz-border-radius: 3px;
+        border-radius: 3px;
+}
+
 .warning legend,
 .warning a,
 .error a {
@@ -740,7 +750,7 @@ div.crumb:active {
 
 /* special rules for first-level entries and folders */
 #app-navigation > ul > li {
-	background-color: #eee;
+	background-color: #f8f8f8;
 }
 
 #app-navigation .with-icon a {
@@ -861,6 +871,10 @@ div.crumb:active {
 	color: #dd1144;
 }
 
+#app-navigation .app-navigation-separator {
+	border-bottom: 1px solid #ddd;
+}
+
 
 
 /* Part where the content will be loaded into */
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 280c5a94b60..83b8fca1eab 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -30,13 +30,13 @@ $TRANSLATIONS = array(
 "December" => "Abendua",
 "Settings" => "Ezarpenak",
 "seconds ago" => "segundu",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("orain dela minutu %n","orain dela %n minutu"),
+"_%n hour ago_::_%n hours ago_" => array("orain dela ordu %n","orain dela %n ordu"),
 "today" => "gaur",
 "yesterday" => "atzo",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("orain dela egun %n","orain dela %n egun"),
 "last month" => "joan den hilabetean",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"),
 "months ago" => "hilabete",
 "last year" => "joan den urtean",
 "years ago" => "urte",
@@ -83,6 +83,7 @@ $TRANSLATIONS = array(
 "Email sent" => "Eposta bidalia",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
+"%s password reset" => "%s pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "The link to reset your password has been sent to your email.<br>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 ." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?",
@@ -125,6 +126,7 @@ $TRANSLATIONS = array(
 "Finish setup" => "Bukatu konfigurazioa",
 "%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
 "Log out" => "Saioa bukatu",
+"More apps" => "App gehiago",
 "Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!",
 "If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!",
 "Please change your password to secure your account again." => "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 7f3f4dfdd32..c9c6e1f7507 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s שיתף/שיתפה איתך את »%s«",
 "Category type not provided." => "סוג הקטגוריה לא סופק.",
 "No category to add?" => "אין קטגוריה להוספה?",
 "This category already exists: %s" => "הקטגוריה הבאה כבר קיימת: %s",
@@ -29,13 +30,13 @@ $TRANSLATIONS = array(
 "December" => "דצמבר",
 "Settings" => "הגדרות",
 "seconds ago" => "שניות",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("לפני %n דקה","לפני %n דקות"),
+"_%n hour ago_::_%n hours ago_" => array("לפני %n שעה","לפני %n שעות"),
 "today" => "היום",
 "yesterday" => "אתמול",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("לפני %n יום","לפני %n ימים"),
 "last month" => "חודש שעבר",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("לפני %n חודש","לפני %n חודשים"),
 "months ago" => "חודשים",
 "last year" => "שנה שעברה",
 "years ago" => "שנים",
@@ -86,6 +87,7 @@ $TRANSLATIONS = array(
 "Request failed!<br>Did you make sure your email/username was right?" => "הבקשה נכשלה!<br>האם כתובת הדוא״ל/שם המשתמש שלך נכונים?",
 "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" => "לדף הכניסה",
@@ -98,10 +100,12 @@ $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\nCheers!" => "שלום,\n\nרצינו לעדכן כי %s שיתף/שיתפה איתך את »%s«.\n\nלצפיה: %s\n\nיום טוב!",
 "Edit categories" => "ערוך קטגוריות",
 "Add" => "הוספה",
 "Security Warning" => "אזהרת אבטחה",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
 "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 לא עובד.",
@@ -118,6 +122,7 @@ $TRANSLATIONS = array(
 "Finish setup" => "סיום התקנה",
 "%s is available. Get more information on how to update." => "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
 "Log out" => "התנתקות",
+"More apps" => "יישומים נוספים",
 "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." => "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש.",
@@ -125,6 +130,7 @@ $TRANSLATIONS = array(
 "remember" => "שמירת הססמה",
 "Log in" => "כניסה",
 "Alternative Logins" => "כניסות אלטרנטיביות",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "שלום,<br><br>רצינו לעדכן כי %s שיתף/שיתפה איתך את »%s«.<br><a href=\"%s\">לצפיה</a><br><br>יום טוב!",
 "Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 7a0af92070d..8c09b4e90fb 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -30,13 +30,13 @@ $TRANSLATIONS = array(
 "December" => "Dicembre",
 "Settings" => "Impostazioni",
 "seconds ago" => "secondi fa",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minuto fa","%n minuti fa"),
+"_%n hour ago_::_%n hours ago_" => array("%n ora fa","%n ore fa"),
 "today" => "oggi",
 "yesterday" => "ieri",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n giorno fa","%n giorni fa"),
 "last month" => "mese scorso",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"),
 "months ago" => "mesi fa",
 "last year" => "anno scorso",
 "years ago" => "anni fa",
@@ -83,6 +83,7 @@ $TRANSLATIONS = array(
 "Email sent" => "Messaggio inviato",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
+"%s password reset" => "Ripristino password di %s",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
 "The link to reset your password has been sent to your email.<br>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 ." => "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?",
@@ -125,6 +126,7 @@ $TRANSLATIONS = array(
 "Finish setup" => "Termina la configurazione",
 "%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
 "Log out" => "Esci",
+"More apps" => "Altre applicazioni",
 "Automatic logon rejected!" => "Accesso automatico rifiutato.",
 "If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso.",
 "Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.",