diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 85e35f5ddd..ba87330c48 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -9,7 +9,7 @@ $TRANSLATIONS = array(
"Private key password successfully updated." => "Gizli anahtar parolası başarıyla güncellendi",
"Could not update the private key password. Maybe the old password was not correct." => "Gizli anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Gizli anahtarınız geçerli değil! Muhtemelen parolanız ownCloud sistemi %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Gizli anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifresi çözülemiyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
"Unknown error please check your system settings or contact your administrator" => "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin",
"Missing requirements." => "Gereklilikler eksik.",
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index cc28d074a0..eedc208fbb 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -16,7 +16,11 @@ $TRANSLATIONS = array(
"Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
"Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
"Saved" => "Αποθηκεύτηκαν",
+"Note: " => "Σημείωση: ",
" and " => "και",
+"Note: The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Σημείωση: Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+"Note: The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Σημείωση: Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+"Note: \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "Σημείωση: Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
"External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
"Folder name" => "Όνομα φακέλου",
"External storage" => "Εξωτερική αποθήκευση",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index c03a2f49e0..fbd7c6224b 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -4,10 +4,21 @@ $TRANSLATIONS = array(
"Location" => "Emplacement",
"Amazon S3" => "Amazon S3",
"Key" => "Clé",
+"Secret" => "Secret",
"Access Key" => "Clé d'accès",
+"Secret Key" => "Clé secrète",
+"Hostname (optional)" => "Nom machine (optionnel)",
+"Port (optional)" => "Port (optionnel)",
+"Enable SSL" => "Activer SSL",
+"App key" => "Clé App",
"URL" => "URL",
"Username" => "Nom d'utilisateur",
"Password" => "Mot de passe",
+"Root" => "Root",
+"Client ID" => "ID Client",
+"Username (required)" => "Nom d'utilisation (requis)",
+"API Key (required for Rackspace Cloud Files)" => "Clé API (requis pour Rackspace Cloud Files)",
+"Password (required for OpenStack Object Storage)" => "Mot de passe (requis pour OpenStack Object Storage)",
"Share" => "Partager",
"Access granted" => "Accès autorisé",
"Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index cfc5286a40..b52e2a652d 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
"Backup (Replica) Port" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
"Disable Main Server" => "Απενεργοποιηση του κεντρικου διακομιστη",
"Only connect to the replica server." => "Σύνδεση μόνο με το διακομιστή-αντίγραφο.",
+"Case insensitive LDAP server (Windows)" => "Διακομιστής LDAP με διάκριση πεζών-κεφαλαίων (Windows)",
"Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Δεν προτείνεται, χρησιμοποιείστε το μόνο για δοκιμές! Εάν η σύνδεση λειτουργεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.",
"Cache Time-To-Live" => "Cache Time-To-Live",
@@ -88,6 +89,8 @@ $TRANSLATIONS = array(
"Group Search Attributes" => "Ομάδα Χαρακτηριστικων Αναζήτηση",
"Group-Member association" => "Group-Member association",
"Nested Groups" => "Φωλιασμένες ομάδες",
+"Paging chunksize" => "Μέγεθος σελιδοποίησης",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Μέγεθος τμήματος που χρησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μπορεί να επιστρέψουν πολλά δεδομένα, όπως απαρίθμηση χρηστών ή ομάδων. (Η τιμή 0 απενεργοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτές τις περιπτώσεις.)",
"Special Attributes" => "Ειδικά Χαρακτηριστικά ",
"Quota Field" => "Ποσοσταση πεδιου",
"Quota Default" => "Προκαθισμενο πεδιο",
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 79efa67242..a8016289e2 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n maande gelede","%n maande gelede"),
"last year" => "verlede jaar",
"years ago" => "jare gelede",
-"Choose" => "Kies",
"Yes" => "Ja",
"No" => "Nee",
+"Choose" => "Kies",
"Ok" => "OK",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"New Files" => "Nuwe leêrs",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 16092348ec..f28e4e48f8 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","","","","",""),
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
-"Choose" => "اختيار",
"Yes" => "نعم",
"No" => "لا",
+"Choose" => "اختيار",
"Ok" => "موافق",
"_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
"Cancel" => "الغاء",
diff --git a/core/l10n/be.php b/core/l10n/be.php
index 383d2494d2..d0c3b3ecba 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","","",""),
"last year" => "У мінулым годзе",
"years ago" => "Гадоў таму",
-"Choose" => "Выбар",
"Yes" => "Так",
"No" => "Не",
+"Choose" => "Выбар",
"Ok" => "Добра",
"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
"Error" => "Памылка",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 861d7370ed..63b9d28695 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "последната година",
"years ago" => "последните години",
-"Choose" => "Избери",
"Yes" => "Да",
"No" => "Не",
+"Choose" => "Избери",
"Ok" => "Добре",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Отказ",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index e9f46d686c..9f0e121bca 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "গত বছর",
"years ago" => "বছর পূর্বে",
-"Choose" => "বেছে নিন",
"Yes" => "হ্যাঁ",
"No" => "না",
+"Choose" => "বেছে নিন",
"Ok" => "তথাস্তু",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "বাতির",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d4adb682f8..f4060bd3df 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"),
"last year" => "l'any passat",
"years ago" => "anys enrere",
-"Choose" => "Escull",
-"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
"Yes" => "Sí",
"No" => "No",
+"Choose" => "Escull",
+"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
"Ok" => "D'acord",
"Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicte de fitxer","{count} conflictes de fitxer"),
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 2e373e63ba..6a3ba0d309 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"),
"last year" => "minulý rok",
"years ago" => "před lety",
-"Choose" => "Vybrat",
-"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
"Yes" => "Ano",
"No" => "Ne",
+"Choose" => "Vybrat",
+"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"),
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index b79c1d5df5..1e88cd71c8 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","","",""),
"last year" => "y llynedd",
"years ago" => "blwyddyn yn ôl",
-"Choose" => "Dewisiwch",
"Yes" => "Ie",
"No" => "Na",
+"Choose" => "Dewisiwch",
"Ok" => "Iawn",
"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
"Cancel" => "Diddymu",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index f7906e168b..d3b346832f 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
"last year" => "sidste år",
"years ago" => "år siden",
-"Choose" => "Vælg",
-"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
"Yes" => "Ja",
"No" => "Nej",
+"Choose" => "Vælg",
+"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Fejl ved indlæsning af besked skabelon: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 7a0aecf4d5..6580cb07ed 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Yes" => "Ja",
"No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 1a2c56635c..44152d9dfa 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
"Yes" => "Ja",
"No" => "Nein",
+"Choose" => "Auswählen",
"Ok" => "OK",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"New Files" => "Neue Dateien",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index b8bce778f8..d9d7f3c6cc 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Yes" => "Ja",
"No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
diff --git a/core/l10n/el.php b/core/l10n/el.php
index c9506fda05..7486e980e0 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -41,15 +41,16 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n μήνας πριν","%n μήνες πριν"),
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
-"Choose" => "Επιλέξτε",
-"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
"Yes" => "Ναι",
"No" => "Όχι",
+"Choose" => "Επιλέξτε",
+"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
"Ok" => "Οκ",
"Error loading message template: {error}" => "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"),
"One file conflict" => "Ένα αρχείο διαφέρει",
"New Files" => "Νέα Αρχεία",
+"Already existing files" => "Ήδη υπάρχοντα αρχεία",
"Which files do you want to keep?" => "Ποια αρχεία θέλετε να κρατήσετε;",
"If you select both versions, the copied file will have a number added to its name." => "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο.",
"Cancel" => "Άκυρο",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 016bf23e8e..2875ba732d 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
"last year" => "last year",
"years ago" => "years ago",
-"Choose" => "Choose",
-"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
"Yes" => "Yes",
"No" => "No",
+"Choose" => "Choose",
+"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Error loading message template: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"),
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 19d330e5c2..9368a357d2 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("antaŭ %n monato","antaŭ %n monatoj"),
"last year" => "lastajare",
"years ago" => "jaroj antaŭe",
-"Choose" => "Elekti",
"Yes" => "Jes",
"No" => "Ne",
+"Choose" => "Elekti",
"Ok" => "Akcepti",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosierkonflikto","{count} dosierkonfliktoj"),
"One file conflict" => "Unu dosierkonflikto",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index ca314a8b53..2e46abc366 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Hace %n mes","hace %n meses"),
"last year" => "el año pasado",
"years ago" => "hace años",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Yes" => "Sí",
"No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 1bf43449fd..cc15230ee4 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"last year" => "el año pasado",
"years ago" => "años atrás",
-"Choose" => "Elegir",
-"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
"Yes" => "Sí",
"No" => "No",
+"Choose" => "Elegir",
+"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Error cargando la plantilla del mensaje: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("un archivo en conflicto","{count} archivos en conflicto"),
diff --git a/core/l10n/es_CL.php b/core/l10n/es_CL.php
index cab130cbd3..f3e7788596 100644
--- a/core/l10n/es_CL.php
+++ b/core/l10n/es_CL.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "último año",
"years ago" => "años anteriores",
-"Choose" => "Choose",
"Yes" => "Si",
"No" => "No",
+"Choose" => "Choose",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Cancelar",
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
index dca69ebaa3..fe5243e7a5 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"last year" => "el año pasado",
"years ago" => "años antes",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Yes" => "Sí",
"No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 4807bc0414..253761a619 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n kuu tagasi","%n kuud tagasi"),
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
-"Choose" => "Vali",
-"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel: {error}",
"Yes" => "Jah",
"No" => "Ei",
+"Choose" => "Vali",
+"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"),
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 13a28602ff..aebd5d56ca 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"),
"last year" => "joan den urtean",
"years ago" => "urte",
-"Choose" => "Aukeratu",
-"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
"Yes" => "Bai",
"No" => "Ez",
+"Choose" => "Aukeratu",
+"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
"Ok" => "Ados",
"Error loading message template: {error}" => "Errorea mezu txantiloia kargatzean: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"),
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index ee634f466c..5e08a5baf7 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "سال قبل",
"years ago" => "سالهای قبل",
-"Choose" => "انتخاب کردن",
"Yes" => "بله",
"No" => "نه",
+"Choose" => "انتخاب کردن",
"Ok" => "قبول",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "فایل های جدید",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 9188469abc..711253090a 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"),
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
-"Choose" => "Valitse",
-"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
"Yes" => "Kyllä",
"No" => "Ei",
+"Choose" => "Valitse",
+"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Virhe ladatessa viestipohjaa: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} tiedoston ristiriita","{count} tiedoston ristiriita"),
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 49be57abf3..cefba312d2 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"),
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
-"Choose" => "Choisir",
-"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
"Yes" => "Oui",
"No" => "Non",
+"Choose" => "Choisir",
+"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"),
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 9509446ec7..c75f10a6a9 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
-"Choose" => "Escoller",
-"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
"Yes" => "Si",
"No" => "Non",
+"Choose" => "Escoller",
+"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de ficheiro","{count} conflitos de ficheiros"),
diff --git a/core/l10n/he.php b/core/l10n/he.php
index d629ac6621..79c70d0ded 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("לפני %n חודש","לפני %n חודשים"),
"last year" => "שנה שעברה",
"years ago" => "שנים",
-"Choose" => "בחירה",
"Yes" => "כן",
"No" => "לא",
+"Choose" => "בחירה",
"Ok" => "בסדר",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"New Files" => "קבצים חדשים",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 60b82a22ad..98f81f6c66 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "prošlu godinu",
"years ago" => "godina",
-"Choose" => "Izaberi",
"Yes" => "Da",
"No" => "Ne",
+"Choose" => "Izaberi",
"Ok" => "U redu",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"Cancel" => "Odustani",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 56b8b4dbc4..bdcb5c13bf 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"),
"last year" => "tavaly",
"years ago" => "több éve",
-"Choose" => "Válasszon",
-"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
"Yes" => "Igen",
"No" => "Nem",
+"Choose" => "Válasszon",
+"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"),
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index ef9c79a654..42f40a160b 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -38,9 +38,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "ultime anno",
"years ago" => "annos passate",
-"Choose" => "Seliger",
"Yes" => "Si",
"No" => "No",
+"Choose" => "Seliger",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de file","{count} conflictos de file"),
"One file conflict" => "Un conflicto de file",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 7bb6883943..6d2b92395b 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"),
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
-"Choose" => "Pilih",
-"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
"Yes" => "Ya",
"No" => "Tidak",
+"Choose" => "Pilih",
+"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
"Ok" => "Oke",
"Error loading message template: {error}" => "Galat memuat templat pesan: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"),
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 254c4b3868..6ec4ac3ad8 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "síðasta ári",
"years ago" => "einhverjum árum",
-"Choose" => "Veldu",
"Yes" => "Já",
"No" => "Nei",
+"Choose" => "Veldu",
"Ok" => "Í lagi",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Hætta við",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index dfcc0a480a..7159099a35 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"),
"last year" => "anno scorso",
"years ago" => "anni fa",
-"Choose" => "Scegli",
-"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
"Yes" => "Sì",
"No" => "No",
+"Choose" => "Scegli",
+"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"),
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index cedf0009cb..744bfb2b11 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%nヶ月前"),
"last year" => "1年前",
"years ago" => "数年前",
-"Choose" => "選択",
-"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
"Yes" => "はい",
"No" => "いいえ",
+"Choose" => "選択",
+"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"),
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 3389bafa7a..d000dd7543 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "ბოლო წელს",
"years ago" => "წლის წინ",
-"Choose" => "არჩევა",
"Yes" => "კი",
"No" => "არა",
+"Choose" => "არჩევა",
"Ok" => "დიახ",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "ახალი ფაილები",
diff --git a/core/l10n/km.php b/core/l10n/km.php
index 76b1492456..7d13f5fd3c 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -33,9 +33,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n ខែមុន"),
"last year" => "ឆ្នាំមុន",
"years ago" => "ឆ្នាំមុន",
-"Choose" => "ជ្រើស",
"Yes" => "ព្រម",
"No" => "ទេ",
+"Choose" => "ជ្រើស",
"Ok" => "ព្រម",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "ឯកសារថ្មី",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index d8c32e070d..3e2bff3ad6 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n달 전 "),
"last year" => "작년",
"years ago" => "년 전",
-"Choose" => "선택",
-"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
"Yes" => "예",
"No" => "아니요",
+"Choose" => "선택",
+"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
"Ok" => "확인",
"Error loading message template: {error}" => "메시지 템플릿을 불러오는 중 오류 발생: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("파일 {count}개 충돌"),
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 30337c5fc8..4c806988ed 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "Lescht Joer",
"years ago" => "Joren hir",
-"Choose" => "Auswielen",
"Yes" => "Jo",
"No" => "Nee",
+"Choose" => "Auswielen",
"Ok" => "OK",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Which files do you want to keep?" => "Weieng Fichieren wëlls de gär behalen?",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index e3b612df3f..019c4aac36 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("prieš %n mėnesį","prieš %n mėnesius","prieš %n mėnesių"),
"last year" => "praeitais metais",
"years ago" => "prieš metus",
-"Choose" => "Pasirinkite",
-"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
"Yes" => "Taip",
"No" => "Ne",
+"Choose" => "Pasirinkite",
+"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
"Ok" => "Gerai",
"Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"),
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 37cde915c5..6e2c2c566a 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Šomēnes, %n mēneši","Pirms %n mēneša","Pirms %n mēnešiem"),
"last year" => "gājušajā gadā",
"years ago" => "gadus atpakaļ",
-"Choose" => "Izvēlieties",
"Yes" => "Jā",
"No" => "Nē",
+"Choose" => "Izvēlieties",
"Ok" => "Labi",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"New Files" => "Jaunās datnes",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 64c6671abf..4ba3c7fc80 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "минатата година",
"years ago" => "пред години",
-"Choose" => "Избери",
"Yes" => "Да",
"No" => "Не",
+"Choose" => "Избери",
"Ok" => "Во ред",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"One file conflict" => "Конфликт со една датотека",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 4ccf19b186..b9cabbc8df 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -22,9 +22,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
-"Choose" => "ရွေးချယ်",
"Yes" => "ဟုတ်",
"No" => "မဟုတ်ဘူး",
+"Choose" => "ရွေးချယ်",
"Ok" => "အိုကေ",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"Cancel" => "ပယ်ဖျက်မည်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 2a9873f481..e5734d437c 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n dag siden","%n dager siden"),
"last year" => "i fjor",
"years ago" => "år siden",
-"Choose" => "Velg",
-"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
"Yes" => "Ja",
"No" => "Nei",
+"Choose" => "Velg",
+"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Feil ved lasting av meldingsmal: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 961866fc15..e9c07af5d3 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","%n maanden geleden"),
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
-"Choose" => "Kies",
-"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
"Yes" => "Ja",
"No" => "Nee",
+"Choose" => "Kies",
+"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 25d0f1da72..260920f3cd 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n månad sidan","%n månadar sidan"),
"last year" => "i fjor",
"years ago" => "år sidan",
-"Choose" => "Vel",
-"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
"Yes" => "Ja",
"No" => "Nei",
+"Choose" => "Vel",
+"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
"Ok" => "Greitt",
"Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"),
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index b13275822b..b025eeaf71 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "an passat",
"years ago" => "ans a",
-"Choose" => "Causís",
"Yes" => "Òc",
"No" => "Non",
+"Choose" => "Causís",
"Ok" => "D'accòrdi",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Annula",
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
index 021452d0b3..52818e6082 100644
--- a/core/l10n/pa.php
+++ b/core/l10n/pa.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "ਪਿਛਲੇ ਸਾਲ",
"years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ",
-"Choose" => "ਚੁਣੋ",
"Yes" => "ਹਾਂ",
"No" => "ਨਹੀਂ",
+"Choose" => "ਚੁਣੋ",
"Ok" => "ਠੀਕ ਹੈ",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "ਰੱਦ ਕਰੋ",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 0e9860b4bf..f75cf0eaaf 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
-"Choose" => "Wybierz",
-"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
"Yes" => "Tak",
"No" => "Nie",
+"Choose" => "Wybierz",
+"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Błąd podczas ładowania szablonu wiadomości: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"),
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index a7b671b440..d16f2b83d6 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
"Yes" => "Sim",
"No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de arquivo","{count} conflitos de arquivos"),
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 8c5d3fd5a6..db5923ee5f 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"),
"last year" => "ano passado",
"years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
"Yes" => "Sim",
"No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Erro ao carregar o template: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de ficheiro","{count} conflitos de ficheiro"),
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 648e8ba3ea..8d4f2ad164 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "ultimul an",
"years ago" => "ani în urmă",
-"Choose" => "Alege",
"Yes" => "Da",
"No" => "Nu",
+"Choose" => "Alege",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"One file conflict" => "Un conflict de fișier",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index a09178a6cd..16d8cf9a50 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
-"Choose" => "Выбрать",
-"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
"Yes" => "Да",
"No" => "Нет",
+"Choose" => "Выбрать",
+"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
"Ok" => "Ок",
"Error loading message template: {error}" => "Ошибка загрузки шаблона сообщений: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index bb125cc6af..e77a506787 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "පෙර අවුරුද්දේ",
"years ago" => "අවුරුදු කීපයකට පෙර",
-"Choose" => "තෝරන්න",
"Yes" => "ඔව්",
"No" => "එපා",
+"Choose" => "තෝරන්න",
"Ok" => "හරි",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "එපා",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 80d816a461..c5676eab80 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"),
"last year" => "minulý rok",
"years ago" => "pred rokmi",
-"Choose" => "Vybrať",
-"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
"Yes" => "Áno",
"No" => "Nie",
+"Choose" => "Vybrať",
+"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Chyba pri nahrávaní šablóny správy: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"),
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index c87a8d8d8f..3a43fb99c1 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"),
"last year" => "lansko leto",
"years ago" => "let nazaj",
-"Choose" => "Izbor",
-"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
"Yes" => "Da",
"No" => "Ne",
+"Choose" => "Izbor",
+"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
"Ok" => "V redu",
"Error loading message template: {error}" => "Napaka nalaganja predloge sporočil: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"),
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index b3221dc75f..7b66df7afc 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"),
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
-"Choose" => "Zgjidh",
"Yes" => "Po",
"No" => "Jo",
+"Choose" => "Zgjidh",
"Ok" => "Në rregull",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Anulo",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 388ebb0df9..5a9a1c0165 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "прошле године",
"years ago" => "година раније",
-"Choose" => "Одабери",
"Yes" => "Да",
"No" => "Не",
+"Choose" => "Одабери",
"Ok" => "У реду",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"Cancel" => "Откажи",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index e7783b3c02..c6b3de13ca 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "prošle godine",
"years ago" => "pre nekoliko godina",
-"Choose" => "Izaberi",
"Yes" => "Da",
"No" => "Ne",
+"Choose" => "Izaberi",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"Cancel" => "Otkaži",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index f24398c662..4714885675 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
"last year" => "förra året",
"years ago" => "år sedan",
-"Choose" => "Välj",
-"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
"Yes" => "Ja",
"No" => "Nej",
+"Choose" => "Välj",
+"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Fel uppstod under inläsningen av meddelandemallen: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index c0b4dce7cf..72d195f833 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "கடந்த வருடம்",
"years ago" => "வருடங்களுக்கு முன்",
-"Choose" => "தெரிவுசெய்க ",
"Yes" => "ஆம்",
"No" => "இல்லை",
+"Choose" => "தெரிவுசெய்க ",
"Ok" => "சரி",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "இரத்து செய்க",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 61a67f7802..95416aaa26 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "ปีที่แล้ว",
"years ago" => "ปี ที่ผ่านมา",
-"Choose" => "เลือก",
"Yes" => "ตกลง",
"No" => "ไม่ตกลง",
+"Choose" => "เลือก",
"Ok" => "ตกลง",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "ไฟล์ใหม่",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index d5880d8a09..fcb9470dcc 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n ay önce","%n ay önce"),
"last year" => "geçen yıl",
"years ago" => "yıllar önce",
-"Choose" => "Seç",
-"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
"Yes" => "Evet",
"No" => "Hayır",
+"Choose" => "Seç",
+"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
"Ok" => "Tamam",
"Error loading message template: {error}" => "İleti şablonu yüklenirken hata: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosya çakışması","{count} dosya çakışması"),
@@ -162,7 +162,7 @@ $TRANSLATIONS = array(
"Finish setup" => "Kurulumu tamamla",
"Finishing …" => "Tamamlanıyor ...",
"This application requires JavaScript to be enabled for correct operation. Please enable JavaScript and re-load this interface." => "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesini gerektiriyor. Lütfen JavaScript'i etkinleştirin ve bu arayüzü yeniden yükleyin.",
-"%s is available. Get more information on how to update." => "%s mevcut. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
+"%s is available. Get more information on how to update." => "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
"Log out" => "Çıkış yap",
"Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
"If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmediyseniz hesabınız tehlikede olabilir!",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 015183e647..7d928c2c65 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n місяць тому","%n місяці тому","%n місяців тому"),
"last year" => "минулого року",
"years ago" => "роки тому",
-"Choose" => "Обрати",
-"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
"Yes" => "Так",
"No" => "Ні",
+"Choose" => "Обрати",
+"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Помилка при завантаженні шаблону повідомлення: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"),
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 3012eb869c..129ca916fd 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -17,9 +17,9 @@ $TRANSLATIONS = array(
"_%n hour ago_::_%n hours ago_" => array("",""),
"_%n day ago_::_%n days ago_" => array("",""),
"_%n month ago_::_%n months ago_" => array("",""),
-"Choose" => "منتخب کریں",
"Yes" => "ہاں",
"No" => "نہیں",
+"Choose" => "منتخب کریں",
"Ok" => "اوکے",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "منسوخ کریں",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index fe24cb385e..3be7e9cc52 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n tháng trước"),
"last year" => "năm trước",
"years ago" => "năm trước",
-"Choose" => "Chọn",
-"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
"Yes" => "Có",
"No" => "Không",
+"Choose" => "Chọn",
+"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
"Ok" => "Đồng ý",
"Error loading message template: {error}" => "Lỗi khi tải mẫu thông điệp: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} tập tin xung đột"),
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 4d3c55b07f..a172e301d2 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n 月前"),
"last year" => "去年",
"years ago" => "年前",
-"Choose" => "选择(&C)...",
-"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
"Yes" => "是",
"No" => "否",
+"Choose" => "选择(&C)...",
+"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
"Ok" => "好",
"Error loading message template: {error}" => "加载消息模板出错: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲突"),
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 465ae0c700..4372707c33 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n 個月前"),
"last year" => "去年",
"years ago" => "幾年前",
-"Choose" => "選擇",
-"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯: {error}",
"Yes" => "是",
"No" => "否",
+"Choose" => "選擇",
+"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯: {error}",
"Ok" => "好",
"Error loading message template: {error}" => "載入訊息樣板出錯: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} 個檔案衝突"),
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index 508df40e1d..569dcf72ce 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po
index b78298d0ec..3634d2d914 100644
--- a/l10n/ach/settings.po
+++ b/l10n/ach/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index 2641da3bfc..7aa25d1e04 100644
--- a/l10n/ady/core.po
+++ b/l10n/ady/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po
index 1091fe195d..1e15ed0d96 100644
--- a/l10n/ady/settings.po
+++ b/l10n/ady/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index febcf060b8..8975f8093d 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: kalliet \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -60,79 +60,79 @@ msgstr "Geen tydelike profiel foto beskikbaar nie, probeer weer"
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sondag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Mandag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dinsdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Woensdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donderdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Vrydag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Saterdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januarie"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februarie"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Maart"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mei"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junie"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julie"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Augustus"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
@@ -192,75 +192,75 @@ msgstr "verlede jaar"
msgid "years ago"
msgstr "jare gelede"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Kies"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Kies"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nuwe leêrs"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Bestaande leêrs"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Kanseleer"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Gaan voort"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,12 +292,12 @@ msgstr "Gedeel"
msgid "Share"
msgstr "Deel"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Fout"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Deel veroorsaak fout"
@@ -325,107 +325,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Beskerm met Wagwoord"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Wagwoord"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Laat Publieke Oplaai toe"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "E-pos aan persoon"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Stuur"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Stel verval datum"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Verval datum"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Deel oor epos:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Geen persoon gevind"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "groep"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Hernieu deel is nie toegelaat nie "
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Gedeel in {item} met {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Deel terug neem"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kan wysig"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "toegang beheer"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "skep"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "opdateer"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "uitvee"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "deel"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Beskerm met wagwoord"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Fout met skrapping van verval datum"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Fout met opstel van verval datum"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Stuur ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-pos gestuur"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 3f32827eff..f9594ecf24 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ak/core.po b/l10n/ak/core.po
index 2314857d23..457497f17c 100644
--- a/l10n/ak/core.po
+++ b/l10n/ak/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/ak/settings.po b/l10n/ak/settings.po
index 09116dd0e5..1b3fb19de4 100644
--- a/l10n/ak/settings.po
+++ b/l10n/ak/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/am_ET/core.po b/l10n/am_ET/core.po
index 3d756941bf..9cbd154376 100644
--- a/l10n/am_ET/core.po
+++ b/l10n/am_ET/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/am_ET/settings.po b/l10n/am_ET/settings.po
index df1a06cb32..a071302ace 100644
--- a/l10n/am_ET/settings.po
+++ b/l10n/am_ET/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 6a6bdb49e5..c02b0ebaa4 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: m3tz.gh \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -61,79 +61,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "الأحد"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "الأثنين"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "الثلاثاء"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "الاربعاء"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "الخميس"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "الجمعه"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "السبت"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "كانون الثاني"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "شباط"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "آذار"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "نيسان"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "أيار"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "حزيران"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "تموز"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "آب"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "أيلول"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "تشرين الاول"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "تشرين الثاني"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "كانون الاول"
@@ -209,31 +209,31 @@ msgstr "السنةالماضية"
msgid "years ago"
msgstr "سنة مضت"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "اختيار"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "نعم"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "لا"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "اختيار"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "موافق"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
@@ -243,45 +243,45 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "الغاء"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -313,12 +313,12 @@ msgstr "مشارك"
msgid "Share"
msgstr "شارك"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "خطأ"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "حصل خطأ عند عملية المشاركة"
@@ -346,107 +346,116 @@ msgstr ""
msgid "Share link"
msgstr "شارك الرابط"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "حماية كلمة السر"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "كلمة المرور"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "اسمح بالرفع للعامة"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "ارسل الرابط بالبريد الى صديق"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "أرسل"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "تعيين تاريخ إنتهاء الصلاحية"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "تاريخ إنتهاء الصلاحية"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "مشاركة عبر البريد الإلكتروني:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "لم يتم العثور على أي شخص"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "مجموعة"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "لا يسمح بعملية إعادة المشاركة"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "شورك في {item} مع {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "إلغاء مشاركة"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "التحرير مسموح"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "ضبط الوصول"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "إنشاء"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "تحديث"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "حذف"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "مشاركة"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "محمي بكلمة السر"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "جاري الارسال ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "تم ارسال البريد الالكتروني"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "تحذير"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index fd0c1b248f..775408fc6b 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -192,7 +192,7 @@ msgstr "Back-end لا يدعم تغيير كلمة المرور, لاكن مفت
msgid "Unable to change password"
msgstr "لا يمكن تغيير كلمة المرور"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "جاري الارسال ..."
@@ -517,61 +517,52 @@ msgstr "السماح للتطبيقات بالمشاركة عن طريق الAPI
msgid "Allow links"
msgstr "السماح بالعناوين"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "السماح بالرفع للعامة "
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "السماح للمستخدمين بتفعيل الرفع للاخرين من خلال مجلد المشاركة العام "
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "السماح بإعادة المشاركة "
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد "
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "السماح بتنبيهات البريد الالكتروني."
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "السماح بإعادة المشاركة "
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد "
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "السماح بتنبيهات البريد الالكتروني."
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ast/core.po b/l10n/ast/core.po
index c542ca0e84..9327b0ecba 100644
--- a/l10n/ast/core.po
+++ b/l10n/ast/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-13 19:41+0000\n"
-"Last-Translator: Iñigo Varela \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -61,79 +61,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingu"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Llunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Xueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Vienres"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábadu"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Xineru"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febreru"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzu"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayu"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Xunu"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Xunetu"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agostu"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Setiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Ochobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Payares"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Avientu"
@@ -293,12 +293,12 @@ msgstr "Compartíu"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Fallu"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Fallu mientres la compartición"
@@ -326,107 +326,116 @@ msgstr ""
msgid "Share link"
msgstr "Compartir enllaz"
-#: js/share.js:223
-msgid "Password protect"
-msgstr "Protexer con contraseña"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contraseña"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "Protexer con contraseña"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "Enlláz de corréu electrónicu a la persona"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Unviar"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Afitar la data de caducidá"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data de caducidá"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Compartir vía corréu electrónicu:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Nun s'atoparon persones"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupu"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Recompartir nun ta permitíu"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Compartíu en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Dexar de compartir"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notificar per corréu"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "pue editar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "control d'accesu"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "xubir"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "desaniciar"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Contraseña protexida"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Fallu desafitando la data de caducidá"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Fallu afitando la fecha de caducidá"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Unviando ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Corréu unviáu"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Avisu"
diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po
index c30a8f0470..c818132fe7 100644
--- a/l10n/ast/settings.po
+++ b/l10n/ast/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr "El back-end nun sofita cambeos de contraseña, pero la contraseña de ci
msgid "Unable to change password"
msgstr "Nun pudo camudase la contraseña"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Unviando..."
@@ -515,62 +515,53 @@ msgstr "Permitir a les aplicaciones usar la API de Compartición"
msgid "Allow links"
msgstr "Permitir enllaces"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Permitir xubes públiques"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir a los usuarios habilitar a otros pa xubir ficheros nes sos carpetes compartíes públicamente"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permitir re-compartición"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Permitir a los usuarios compartir de nuevu elementos ya compartíos"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir a los usuarios compartir con cualesquier persona"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Permitir a los usuarios compartir namái colos usuarios nos sos grupos"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Permitir notificaciones per corréu-e"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Afitar la data d'espiración predeterminada"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Caduca dempués de"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "díes"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Facer cumplir la data de caducidá"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Permitir re-compartición"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir a los usuarios compartir de nuevu elementos ya compartíos"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Permitir a los usuarios compartir con cualesquier persona"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Permitir a los usuarios compartir namái colos usuarios nos sos grupos"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Permitir notificaciones per corréu-e"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Ficheros compartíos caduquen dempués de N díes"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/az/core.po b/l10n/az/core.po
index f61bb1c4aa..e026f73529 100644
--- a/l10n/az/core.po
+++ b/l10n/az/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/az/settings.po b/l10n/az/settings.po
index a250f264cc..43c8097bf1 100644
--- a/l10n/az/settings.po
+++ b/l10n/az/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 032a82dadb..f86f3ec903 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Нядзеля"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Панядзелак"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Аўторак"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Серада"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Чацвер"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Пятніца"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Субота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Студзень"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Люты"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Сакавік"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Красавік"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Май"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Чэрвень"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Ліпень"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Жнівень"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Верасень"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Кастрычнік"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Лістапад"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Снежань"
@@ -199,31 +199,31 @@ msgstr "У мінулым годзе"
msgid "years ago"
msgstr "Гадоў таму"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Выбар"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Выбар"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Добра"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
@@ -231,45 +231,45 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -301,12 +301,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Памылка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -334,107 +334,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 84c808cc31..8271bfef04 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index a1cb68bac2..8bc8bc027a 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Неделя"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понеделник"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Вторник"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Сряда"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четвъртък"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Петък"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Събота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Януари"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Февруари"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Март"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Април"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Май"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Юни"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Юли"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Август"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Септември"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Октомври"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Ноември"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Декември"
@@ -191,75 +191,75 @@ msgstr "последната година"
msgid "years ago"
msgstr "последните години"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Избери"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Избери"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Добре"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Отказ"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,12 +291,12 @@ msgstr "Споделено"
msgid "Share"
msgstr "Споделяне"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Грешка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Грешка при споделяне"
@@ -324,107 +324,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "Защитено с парола"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Парола"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "Защитено с парола"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Парола"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "Изпрати връзка до пощата на някои"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Изпрати"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Посочи дата на изтичане"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Дата на изтичане"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "сподели по поща:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Не са открити хора"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "група"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Допълнително споделяне не е разрешено"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Споделено в {item} с {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Премахни споделяне"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "може да променя"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "контрол на достъпа"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "създаване"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "Обновяване"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "Изтриване"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "Споделяне"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Защитено с парола"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Грешка при премахване на дата за изтичане"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Грепка при поставяне на дата за изтичане"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Изпращам ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Пощата е изпратена"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Внимание"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index e7d3b62268..c697e5015c 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 983df4f606..01eca1d71e 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "রবিবার"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "সোমবার"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "মঙ্গলবার"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "বুধবার"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "বৃহস্পতিবার"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "শুক্রবার"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "শনিবার"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "জানুয়ারি"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ফেব্রুয়ারি"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "মার্চ"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "এপ্রিল"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "মে"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "জুন"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "জুলাই"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "অগাষ্ট"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "সেপ্টেম্বর"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "অক্টোবর"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "নভেম্বর"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ডিসেম্বর"
@@ -190,75 +190,75 @@ msgstr "গত বছর"
msgid "years ago"
msgstr "বছর পূর্বে"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "বেছে নিন"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "হ্যাঁ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "না"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "বেছে নিন"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "তথাস্তু"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "বাতির"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr "ভাগাভাগিকৃত"
msgid "Share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "সমস্যা"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে "
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "কূটশব্দ সুরক্ষিত"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "কূটশব্দ"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "কূটশব্দ সুরক্ষিত"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "কূটশব্দ"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "ব্যক্তির সাথে ই-মেইল যুক্ত কর"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "পাঠাও"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "ই-মেইলের মাধ্যমে ভাগাভাগি করুনঃ"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "কোন ব্যক্তি খুঁজে পাওয়া গেল না"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "পূনঃরায় ভাগাভাগি অনুমোদিত নয়"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "ভাগাভাগি বাতিল "
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "সম্পাদনা করতে পারবেন"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "অধিগম্যতা নিয়ন্ত্রণ"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "তৈরী করুন"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "পরিবর্ধন কর"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "মুছে ফেল"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "কূটশব্দদ্বারা সুরক্ষিত"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "পাঠানো হচ্ছে......"
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "ই-মেইল পাঠানো হয়েছে"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "সতর্কবাণী"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index d9db22642a..99c326b9b8 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 8eb897aa25..b8276e3549 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -194,76 +194,76 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -295,12 +295,12 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -328,107 +328,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index 7b70e2e5ff..d8cc33aeea 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 2ad8047f14..d6a61cfa1b 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -61,79 +61,79 @@ msgstr "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho"
msgid "No crop data provided"
msgstr "No heu proporcionat dades del retall"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Diumenge"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Dilluns"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dimarts"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Dimecres"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Dijous"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Divendres"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Dissabte"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Gener"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrer"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Març"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maig"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juny"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juliol"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agost"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Setembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desembre"
@@ -193,75 +193,75 @@ msgstr "l'any passat"
msgid "years ago"
msgstr "anys enrere"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escull"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error en carregar la plantilla de càrrega de fitxers: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escull"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error en carregar la plantilla de càrrega de fitxers: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "D'acord"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error en carregar la plantilla de missatge: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicte de fitxer"
msgstr[1] "{count} conflictes de fitxer"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un fitxer en conflicte"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Fitxers nous"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Fitxers que ja existeixen"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Quin fitxer voleu conservar?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancel·la"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continua"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(selecciona-ho tot)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionats)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error en carregar la plantilla de fitxer existent"
@@ -293,12 +293,12 @@ msgstr "Compartit"
msgid "Share"
msgstr "Comparteix"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Error en compartir"
@@ -326,107 +326,116 @@ msgstr "Comparteix amb usuari o grup..."
msgid "Share link"
msgstr "Enllaç de compartició"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Protegir amb contrasenya"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Contrasenya"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Permet pujada pública"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Enllaç per correu electrónic amb la persona"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Envia"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Estableix la data de venciment"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data de venciment"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Comparteix per correu electrònic"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "No s'ha trobat ningú"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grup"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "No es permet compartir de nou"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Compartit en {item} amb {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Deixa de compartir"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notifica per correu electrònic"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "pot editar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "control d'accés"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "crea"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "actualitza"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "elimina"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "comparteix"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protegeix amb contrasenya"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Error en eliminar la data de venciment"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Error en establir la data de venciment"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Enviant..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "El correu electrónic s'ha enviat"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Avís"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 05c24986f0..2b30a3c1fc 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -192,7 +192,7 @@ msgstr "El dorsal no permet canviar la contrasenya, però la clau d'encripació
msgid "Unable to change password"
msgstr "No es pot canviar la contrasenya"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Enviant..."
@@ -517,61 +517,52 @@ msgstr "Permet que les aplicacions utilitzin l'API de compartir"
msgid "Allow links"
msgstr "Permet enllaços"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Permet pujada pública"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permet als usuaris habilitar pujades de tercers en les seves carpetes compartides al públic"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permet compartir de nou"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Permet als usuaris compartir de nou elements ja compartits amb ells"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Permet compartir amb qualsevol"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Permet als usuaris compartir només amb els usuaris del seu grup"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Permet notificacions per correu electrónic"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Permet compartir de nou"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Permet als usuaris compartir de nou elements ja compartits amb ells"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Permet compartir amb qualsevol"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Permet als usuaris compartir només amb els usuaris del seu grup"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Permet notificacions per correu electrónic"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index e660a76136..e4b28ed0bd 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: pstast \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -67,79 +67,79 @@ msgstr "Dočasný profilový obrázek není k dispozici, zkuste to znovu"
msgid "No crop data provided"
msgstr "Nebyla poskytnuta data pro oříznutí obrázku"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Neděle"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pondělí"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Úterý"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Středa"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Čtvrtek"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Pátek"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Leden"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Únor"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Březen"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Duben"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Květen"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Červen"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Červenec"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Srpen"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Září"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Říjen"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Listopad"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Prosinec"
@@ -203,76 +203,76 @@ msgstr "minulý rok"
msgid "years ago"
msgstr "před lety"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vybrat"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Chyba při nahrávání šablony výběru souborů: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ano"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vybrat"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Chyba při nahrávání šablony výběru souborů: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Chyba při nahrávání šablony zprávy: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} souborový konflikt"
msgstr[1] "{count} souborové konflikty"
msgstr[2] "{count} souborových konfliktů"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Jeden konflikt souboru"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nové soubory"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Již existující soubory"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Které soubory chcete ponechat?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Zrušit"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Pokračovat"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(vybráno vše)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "(vybráno {count})"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Chyba při nahrávání šablony existence souboru"
@@ -304,12 +304,12 @@ msgstr "Sdílené"
msgid "Share"
msgstr "Sdílet"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Chyba"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Chyba při sdílení"
@@ -337,107 +337,116 @@ msgstr "Sdílet s uživatelem nebo skupinou"
msgid "Share link"
msgstr "Sdílet odkaz"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Chránit heslem"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Heslo"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Povolit veřejné nahrávání"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Odeslat osobě odkaz e-mailem"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Odeslat"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Nastavit datum vypršení platnosti"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Datum vypršení platnosti"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Sdílet e-mailem:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Žádní lidé nenalezeni"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "skupina"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Sdílení již sdílené položky není povoleno"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Sdíleno v {item} s {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Zrušit sdílení"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "upozornit e-mailem"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "lze upravovat"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "řízení přístupu"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "vytvořit"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "aktualizovat"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "smazat"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "sdílet"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Chráněno heslem"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Chyba při odstraňování data vypršení platnosti"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Chyba při nastavení data vypršení platnosti"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Odesílám ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-mail odeslán"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Varování"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 2676c5ec81..0c9a9fabba 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -197,7 +197,7 @@ msgstr "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatel
msgid "Unable to change password"
msgstr "Změna hesla se nezdařila"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Odesílání..."
@@ -522,62 +522,53 @@ msgstr "Povolit aplikacím používat API sdílení"
msgid "Allow links"
msgstr "Povolit odkazy"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Povolit uživatelům sdílet položky veřejně pomocí odkazů"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Povolit veřejné nahrávání souborů"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Povolit uživatelům, aby mohli ostatním umožnit nahrávat do jejich veřejně sdílené složky"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Povolit znovu-sdílení"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Povolit uživatelům sdílet s kýmkoliv"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Povolit e-mailová upozornění"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Nastavit výchozí datum vypršení platnosti"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Vyprší po"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "dnech"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Vynutit datum vypršení"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Povolit uživatelům sdílet položky veřejně pomocí odkazů"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Povolit znovu-sdílení"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Povolit uživatelům sdílet s kýmkoliv"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Povolit e-mailová upozornění"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Výchozí lhůta vypršení sdílení po N dnech"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 4a16f6e358..67698bb978 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sul"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Llun"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Mawrth"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mercher"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Iau"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Gwener"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sadwrn"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Ionawr"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Chwefror"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mawrth"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Ebrill"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Mehefin"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Gorffennaf"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Awst"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Medi"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Hydref"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Tachwedd"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Rhagfyr"
@@ -199,31 +199,31 @@ msgstr "y llynedd"
msgid "years ago"
msgstr "blwyddyn yn ôl"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Dewisiwch"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ie"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Na"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Dewisiwch"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Iawn"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
@@ -231,45 +231,45 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Diddymu"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -301,12 +301,12 @@ msgstr "Rhannwyd"
msgid "Share"
msgstr "Rhannu"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Gwall"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Gwall wrth rannu"
@@ -334,107 +334,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "Diogelu cyfrinair"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Cyfrinair"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "Diogelu cyfrinair"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Cyfrinair"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "E-bostio dolen at berson"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Anfon"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Gosod dyddiad dod i ben"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Dyddiad dod i ben"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Rhannu drwy e-bost:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Heb ganfod pobl"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grŵp"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Does dim hawl ail-rannu"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Rhannwyd yn {item} â {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Dad-rannu"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "yn gallu golygu"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "rheolaeth mynediad"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "creu"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "diweddaru"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "dileu"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "rhannu"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Diogelwyd â chyfrinair"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Gwall wrth osod dyddiad dod i ben"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Yn anfon ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Anfonwyd yr e-bost"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Rhybudd"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index ad83204354..b66915c58c 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 4760ef92e4..6ab0a740ed 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -65,79 +65,79 @@ msgstr "Intet midlertidigt profilbillede tilgængeligt, prøv igen"
msgid "No crop data provided"
msgstr "Ingen beskæringsdata give"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Søndag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Mandag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tirsdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Onsdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Torsdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Fredag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Lørdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marts"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
@@ -197,75 +197,75 @@ msgstr "sidste år"
msgid "years ago"
msgstr "år siden"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vælg"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fejl ved indlæsning af filvælger skabelon: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vælg"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fejl ved indlæsning af filvælger skabelon: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fejl ved indlæsning af besked skabelon: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonflikter"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "En filkonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nye filer"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Allerede eksisterende filer"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Hvilke filer ønsker du at beholde?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annuller"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Videre"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(alle valgt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valgt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fejl ved inlæsning af; fil eksistere skabelon"
@@ -297,12 +297,12 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Fejl"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Fejl under deling"
@@ -330,107 +330,116 @@ msgstr "Del med bruger eller gruppe ..."
msgid "Share link"
msgstr "Del link"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Beskyt med adgangskode"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Kodeord"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Tillad Offentlig Upload"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "E-mail link til person"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Send"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Vælg udløbsdato"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Udløbsdato"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Del via email:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Ingen personer fundet"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "gruppe"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Videredeling ikke tilladt"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Fjern deling"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "Giv besked med mail"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kan redigere"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "Adgangskontrol"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "opret"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "opdater"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "slet"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "del"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Beskyttet med adgangskode"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Fejl ved fjernelse af udløbsdato"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Fejl under sætning af udløbsdato"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sender ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-mail afsendt"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Advarsel"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 5152ab2ff5..fa3bbb1ad0 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -193,7 +193,7 @@ msgstr "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnø
msgid "Unable to change password"
msgstr "Kunne ikke ændre kodeord"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Sender..."
@@ -518,61 +518,52 @@ msgstr "Tillad apps til at bruge Share API"
msgid "Allow links"
msgstr "Tillad links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Tillad brugere at dele elementer til offentligheden med links"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Tillad offentlig upload"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Tillad videredeling"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Tillad brugere at dele elementer delt med dem igen"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Tillad brugere at dele med alle"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Tillad mail underretninger"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Udløber efter"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "dage"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Tillad brugere at dele elementer til offentligheden med links"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Tillad videredeling"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Tillad brugere at dele elementer delt med dem igen"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Tillad brugere at dele med alle"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Tillad mail underretninger"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 365fd59580..844f7b158c 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -69,79 +69,79 @@ msgstr "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal"
msgid "No crop data provided"
msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonntag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Montag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dienstag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mittwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donnerstag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freitag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samstag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "März"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
@@ -201,75 +201,75 @@ msgstr "Letztes Jahr"
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswählen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswählen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} Dateikonflikt"
msgstr[1] "{count} Dateikonflikte"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Ein Dateikonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Neue Dateien"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Die Dateien existieren bereits"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Welche Dateien möchtest Du behalten?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Fortsetzen"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(Alle ausgewählt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} ausgewählt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fehler beim Laden der vorhanden Dateivorlage"
@@ -301,12 +301,12 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Fehler"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
@@ -334,107 +334,116 @@ msgstr "Mit Benutzer oder Gruppe teilen ...."
msgid "Share link"
msgstr "Link Teilen"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Passwort"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Senden"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Setze ein Ablaufdatum"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Über eine E-Mail teilen:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "Gruppe"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Weiterverteilen ist nicht erlaubt"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Für {user} in {item} freigegeben"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "Per E-Mail informieren"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "erstellen"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "löschen"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "teilen"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Durch ein Passwort geschützt"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-Mail wurde verschickt"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Warnung"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 0c7ad93761..74851398c6 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -109,13 +109,13 @@ msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel dauerhaft gelöscht"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -135,13 +135,13 @@ msgstr "Benutzer konnte nicht gelöscht werden"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Backups erfolgreich wiederhergestellt"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -198,7 +198,7 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
msgid "Unable to change password"
msgstr "Passwort konnte nicht geändert werden"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Sende..."
@@ -284,11 +284,11 @@ msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Verschlüsselungsschlüssel dauerhaft löschen"
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Verschlüsselungsschlüssel wiederherstellen"
#: js/users.js:47
msgid "deleted"
@@ -523,62 +523,53 @@ msgstr "Erlaubt Apps die Nutzung der Share-API"
msgid "Allow links"
msgstr "Erlaubt Links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Öffentliches Hochladen erlauben"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Erlaubt erneutes Teilen"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Mail-Benachrichtigung erlauben"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Setze Ablaufdatum"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Ablauf nach dem"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "Tage"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Ablaufdatum erzwingen"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Erlaubt erneutes Teilen"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Mail-Benachrichtigung erlauben"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
#: templates/admin.php:278
msgid "Security"
@@ -845,15 +836,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden."
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel wiederherstellen"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel löschen"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 6f30c08d86..2e9f6ce530 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonntag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Montag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dienstag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mittwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donnerstag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freitag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samstag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "März"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
@@ -191,75 +191,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,12 +291,12 @@ msgstr ""
msgid "Share"
msgstr "Freigeben"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -324,107 +324,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwort"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwort"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "Gruppe"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Teilung zurücknehmen"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index b43ef756d2..3328f3a997 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index bbd30b27c7..d7cef09660 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -68,79 +68,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonntag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Montag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dienstag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mittwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donnerstag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freitag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samstag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "März"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
@@ -200,75 +200,75 @@ msgstr "Letztes Jahr"
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswählen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswählen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Neue Dateien"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -300,12 +300,12 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Fehler"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
@@ -333,107 +333,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Passwort"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Senden"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Ein Ablaufdatum setzen"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "Gruppe"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "erstellen"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "löschen"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "teilen"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email gesendet"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Warnung"
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index def8f77e25..7f9dc5b0be 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -198,7 +198,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -523,61 +523,52 @@ msgstr "Anwendungen erlauben, die Share-API zu benutzen"
msgid "Allow links"
msgstr "Links erlauben"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Erlaube öffentliches hochladen"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Erlaube Weiterverteilen"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Erlaube Weiterverteilen"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index ae80f46c39..ad4d306890 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -69,79 +69,79 @@ msgstr "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal"
msgid "No crop data provided"
msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonntag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Montag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dienstag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mittwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donnerstag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freitag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samstag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "März"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
@@ -201,75 +201,75 @@ msgstr "Letztes Jahr"
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswählen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswählen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} Dateikonflikt"
msgstr[1] "{count} Dateikonflikte"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Ein Dateikonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Neue Dateien"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Die Dateien existieren bereits"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Welche Dateien möchten Sie behalten?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Fortsetzen"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(Alle ausgewählt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} ausgewählt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fehler beim Laden der vorhanden Dateivorlage"
@@ -301,12 +301,12 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Fehler"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
@@ -334,107 +334,116 @@ msgstr "Mit Benutzer oder Gruppe teilen ...."
msgid "Share link"
msgstr "Link teilen"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Passwort"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Senden"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Ein Ablaufdatum setzen"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "Gruppe"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "Per E-Mail informieren"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "erstellen"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "löschen"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "teilen"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email gesendet"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Warnung"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index e35588609c..acd55567b6 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -110,13 +110,13 @@ msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passw
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel dauerhaft gelöscht"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -136,13 +136,13 @@ msgstr "Der Benutzer konnte nicht gelöscht werden"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Backups erfolgreich wiederhergestellt"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -199,7 +199,7 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
msgid "Unable to change password"
msgstr "Passwort konnte nicht geändert werden"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Sende..."
@@ -285,11 +285,11 @@ msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann ein
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Verschlüsselungsschlüssel dauerhaft löschen"
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Verschlüsselungsschlüssel wiederherstellen"
#: js/users.js:47
msgid "deleted"
@@ -524,62 +524,53 @@ msgstr "Anwendungen erlauben, die Share-API zu benutzen"
msgid "Allow links"
msgstr "Links erlauben"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Öffentliches Hochladen erlauben"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Erlaube Weiterverteilen"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Mail-Benachrichtigung erlauben"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Setze Ablaufdatum"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Ablauf nach dem"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "Tage"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Ablaufdatum erzwingen"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Erlaube Weiterverteilen"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Mail-Benachrichtigung erlauben"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
#: templates/admin.php:278
msgid "Security"
@@ -846,15 +837,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden."
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel wiederherstellen"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Verschlüsselungsschlüssel löschen"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 419b2ddfd7..08ff96180e 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -69,79 +69,79 @@ msgstr "Δεν υπάρχει προσωρινή φωτογραφία προφί
msgid "No crop data provided"
msgstr "Δεν δόθηκαν δεδομένα περικοπής"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Κυριακή"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Δευτέρα"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Τρίτη"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Τετάρτη"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Πέμπτη"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Παρασκευή"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Σάββατο"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Ιανουάριος"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Φεβρουάριος"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Μάρτιος"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Απρίλιος"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Μάϊος"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Ιούνιος"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Ιούλιος"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Αύγουστος"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Σεπτέμβριος"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Οκτώβριος"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Νοέμβριος"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Δεκέμβριος"
@@ -201,75 +201,75 @@ msgstr "τελευταίο χρόνο"
msgid "years ago"
msgstr "χρόνια πριν"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Επιλέξτε"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ναι"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Όχι"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Επιλέξτε"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Οκ"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} αρχείο διαφέρει"
msgstr[1] "{count} αρχεία διαφέρουν"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Ένα αρχείο διαφέρει"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Νέα Αρχεία"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "Ήδη υπάρχοντα αρχεία"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Ποια αρχεία θέλετε να κρατήσετε;"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Άκυρο"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Συνέχεια"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(όλα τα επιλεγμένα)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} επιλέχθησαν)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Σφάλμα κατά την φόρτωση του προτύπου ύπαρξης αρχείου"
@@ -301,12 +301,12 @@ msgstr "Κοινόχρηστα"
msgid "Share"
msgstr "Διαμοιρασμός"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Σφάλμα"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Σφάλμα κατά τον διαμοιρασμό"
@@ -334,107 +334,116 @@ msgstr "Διαμοιρασμός με χρήστη ή ομάδα ..."
msgid "Share link"
msgstr "Διαμοιρασμός συνδέσμου"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Προστασία συνθηματικού"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Συνθηματικό"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Επιτρέπεται η Δημόσια Αποστολή"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Αποστολή συνδέσμου με email "
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Αποστολή"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Ορισμός ημ. λήξης"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Ημερομηνία λήξης"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Διαμοιρασμός μέσω email:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Δεν βρέθηκε άνθρωπος"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "ομάδα"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Διαμοιρασμός του {item} με τον {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Διακοπή διαμοιρασμού"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "ειδοποίηση με email"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "δυνατότητα αλλαγής"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "έλεγχος πρόσβασης"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "δημιουργία"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "ενημέρωση"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "διαγραφή"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "διαμοιρασμός"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Προστασία με συνθηματικό"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Αποστολή..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Το Email απεστάλη "
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Προειδοποίηση"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index b8f4de6910..f931ee855e 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: thea_rad \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-14 11:25+0000\n"
+"Last-Translator: pe_ppe \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -201,34 +201,34 @@ msgstr "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive "
msgid "Saved"
msgstr "Αποθηκεύτηκαν"
-#: lib/config.php:597
+#: lib/config.php:589
msgid "Note: "
-msgstr ""
+msgstr "Σημείωση: "
-#: lib/config.php:607
+#: lib/config.php:599
msgid " and "
msgstr "και"
-#: lib/config.php:629
+#: lib/config.php:621
#, php-format
msgid ""
"Note: The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Σημείωση: Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει."
-#: lib/config.php:631
+#: lib/config.php:623
#, php-format
msgid ""
"Note: The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Σημείωση: Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει."
-#: lib/config.php:633
+#: lib/config.php:625
#, php-format
msgid ""
"Note: \"%s\" is not installed. Mounting of %s is not possible. Please"
" ask your system administrator to install it."
-msgstr ""
+msgstr "Σημείωση: Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει."
#: templates/settings.php:2
msgid "External Storage"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index b06f6f2a02..707dbc95f0 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-14 11:21+0000\n"
+"Last-Translator: pe_ppe \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:685
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:686
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -81,23 +81,23 @@ msgstr "Μη έγκυρη εικόνα"
msgid "web services under your control"
msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Η λήψη ZIP απενεργοποιήθηκε."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Πίσω στα Αρχεία"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -283,19 +283,19 @@ msgstr "Εισάγετε όνομα χρήστη διαχειριστή."
msgid "Set an admin password."
msgstr "Εισάγετε συνθηματικό διαχειριστή."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the installation guides."
msgstr "Ελέγξτε ξανά τις οδηγίες εγκατάστασης."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
@@ -347,63 +347,63 @@ msgstr ""
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:774
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:835
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:942
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:949
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:955
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1370
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1379
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1394
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1406
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1420
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Αδυναμία εύρεσης κατηγορίας \"%s\""
@@ -460,7 +460,7 @@ msgstr "χρόνια πριν"
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Μόνο οι παρακάτων χαρακτήρες επιτρέπονται σε ένα όνομα χρήστη: \"a-z\", \"A-Z\", \"0-9\" και \"_.@-\""
#: private/user/manager.php:237
msgid "A valid username must be provided"
@@ -472,4 +472,4 @@ msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
#: private/user/manager.php:246
msgid "The username is already being used"
-msgstr ""
+msgstr "Το όνομα χρήστη είναι κατειλημμένο"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 0b1b8f0f0b..e34884d270 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -95,17 +95,17 @@ msgstr "Αδυναμία προσθήκης ομάδας"
#: ajax/decryptall.php:31
msgid "Files decrypted successfully"
-msgstr ""
+msgstr "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία"
#: ajax/decryptall.php:33
msgid ""
"Couldn't decrypt your files, please check your owncloud.log or ask your "
"administrator"
-msgstr ""
+msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας"
#: ajax/decryptall.php:36
msgid "Couldn't decrypt your files, check your password and try again"
-msgstr ""
+msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι"
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
@@ -198,7 +198,7 @@ msgstr "Το βασικό πλαίσιο δεν υποστηρίζει αλλα
msgid "Unable to change password"
msgstr "Αδυναμία αλλαγής συνθηματικού"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Αποστέλεται..."
@@ -523,62 +523,53 @@ msgstr "Επιτρέπει την χρήση του API διαμοιρασμού
msgid "Allow links"
msgstr "Επιτρέπονται οι σύνδεσμοι"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Επιτρέπεται το κοινόχρηστο ανέβασμα"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Επιτρέπει τους χρήστες να καθιστούν άλλους χρήστες ικανούς να ανεβάζουν στους κοινόχρηστους φακέλους τους"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Επιτρέπεται ο επαναδιαμοιρασμός"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Επιτρέπει στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Επιτρέπεται στους χρήστες ο διαμοιρασμός με οποιονδήποτε"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Επιτρέπονται ειδοποιήσεις ηλεκτρονικού ταχυδρομείου"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "ημέρες"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Επιτρέπεται ο επαναδιαμοιρασμός"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Επιτρέπει στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Επιτρέπεται στους χρήστες ο διαμοιρασμός με οποιονδήποτε"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Επιτρέπονται ειδοποιήσεις ηλεκτρονικού ταχυδρομείου"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+msgid "Allow users to send mail notification for shared files"
+msgstr "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 1e36ac4fa1..ed3c438d9c 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-14 11:30+0000\n"
+"Last-Translator: pe_ppe \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -129,25 +129,25 @@ msgstr "Θέλετε να διαγράψετε τις τρέχουσες ρυθ
msgid "Confirm Deletion"
msgstr "Επιβεβαίωση Διαγραφής"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s ομάδα βρέθηκε"
msgstr[1] "%s ομάδες βρέθηκαν"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s χρήστης βρέθηκε"
msgstr[1] "%s χρήστες βρέθηκαν"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Άκυρος εξυπηρετητής"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Αδυναμία εύρεσης επιθυμητου χαρακτηριστικού"
@@ -339,7 +339,7 @@ msgstr "Σύνδεση μόνο με το διακομιστή-αντίγραφ
#: templates/settings.php:26
msgid "Case insensitive LDAP server (Windows)"
-msgstr ""
+msgstr "Διακομιστής LDAP με διάκριση πεζών-κεφαλαίων (Windows)"
#: templates/settings.php:27
msgid "Turn off SSL certificate validation."
@@ -424,14 +424,14 @@ msgstr ""
#: templates/settings.php:40
msgid "Paging chunksize"
-msgstr ""
+msgstr "Μέγεθος σελιδοποίησης"
#: templates/settings.php:40
msgid ""
"Chunksize used for paged LDAP searches that may return bulky results like "
"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
"those situations.)"
-msgstr ""
+msgstr "Μέγεθος τμήματος που χρησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μπορεί να επιστρέψουν πολλά δεδομένα, όπως απαρίθμηση χρηστών ή ομάδων. (Η τιμή 0 απενεργοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτές τις περιπτώσεις.)"
#: templates/settings.php:42
msgid "Special Attributes"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index c30342ea72..35d2ae8bda 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -191,75 +191,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,12 +291,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -324,107 +324,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passcode"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passcode"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 499be02a59..bb41d88781 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index a05c8107e3..404c36e6b3 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr "No temporary profile picture available, try again"
msgid "No crop data provided"
msgstr "No crop data provided"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sunday"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Monday"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tuesday"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Wednesday"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Thursday"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Friday"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Saturday"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "January"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "February"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "March"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "May"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "June"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "July"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "October"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
@@ -191,75 +191,75 @@ msgstr "last year"
msgid "years ago"
msgstr "years ago"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choose"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error loading file picker template: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choose"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error loading file picker template: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error loading message template: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} file conflict"
msgstr[1] "{count} file conflicts"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "One file conflict"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "New Files"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Already existing files"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Which files do you wish to keep?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "If you select both versions, the copied file will have a number added to its name."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancel"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continue"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(all selected)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} selected)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error loading file exists template"
@@ -291,12 +291,12 @@ msgstr "Shared"
msgid "Share"
msgstr "Share"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Error whilst sharing"
@@ -324,107 +324,116 @@ msgstr "Share with user or group …"
msgid "Share link"
msgstr "Share link"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Password protect"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Password"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Allow Public Upload"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Email link to person"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Send"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Set expiration date"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Expiration date"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Share via email:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "No people found"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "group"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Resharing is not allowed"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Shared in {item} with {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Unshare"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notify by email"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "can edit"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "access control"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "create"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "update"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "delete"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "share"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Password protected"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Error unsetting expiration date"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sending ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email sent"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Warning"
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 3b7c741141..b46610d0ae 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -101,13 +101,13 @@ msgstr "Couldn't decrypt your files, check your password and try again"
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Encryption keys deleted permanently"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -127,13 +127,13 @@ msgstr "Unable to delete user"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Backups restored successfully"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -190,7 +190,7 @@ msgstr "Back-end doesn't support password change, but the user's encryption key
msgid "Unable to change password"
msgstr "Unable to change password"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Sending..."
@@ -276,11 +276,11 @@ msgstr "Decrypting files... Please wait, this can take some time."
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Delete encryption keys permanently."
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Restore encryption keys."
#: js/users.js:47
msgid "deleted"
@@ -515,62 +515,53 @@ msgstr "Allow apps to use the Share API"
msgid "Allow links"
msgstr "Allow links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Allow users to share items to the public with links"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Allow public uploads"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Allow users to enable others to upload into their publicly shared folders"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Allow resharing"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Allow users to share items shared with them again"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Allow users to share with anyone"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Allow users to only share with users in their groups"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Allow mail notification"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Allow users to send mail notification for shared files"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Set default expiry date"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Expire after "
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "days"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Enforce expiry date"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Allow users to share items to the public with links"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Allow resharing"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Allow users to share items shared with them again"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Allow users to share with anyone"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Allow users to only share with users in their groups"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Allow mail notification"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Allow users to send mail notification for shared files"
#: templates/admin.php:278
msgid "Security"
@@ -837,15 +828,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly."
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Restore Encryption Keys"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Delete Encryption Keys"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/en_NZ/core.po b/l10n/en_NZ/core.po
index baf9502416..d4cd311766 100644
--- a/l10n/en_NZ/core.po
+++ b/l10n/en_NZ/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -190,75 +190,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/en_NZ/settings.po b/l10n/en_NZ/settings.po
index ffa919a6af..28bd05ee81 100644
--- a/l10n/en_NZ/settings.po
+++ b/l10n/en_NZ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index ff1ba90e2e..a1b16ffd32 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "dimanĉo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "lundo"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "mardo"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "merkredo"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ĵaŭdo"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "vendredo"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "sabato"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januaro"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februaro"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marto"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprilo"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Majo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Aŭgusto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembro"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktobro"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembro"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembro"
@@ -192,75 +192,75 @@ msgstr "lastajare"
msgid "years ago"
msgstr "jaroj antaŭe"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Elekti"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Jes"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Elekti"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Akcepti"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} dosierkonflikto"
msgstr[1] "{count} dosierkonfliktoj"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Unu dosierkonflikto"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Novaj dosieroj"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Kiujn dosierojn vi volas konservi?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Nuligi"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(ĉiuj elektitas)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} elektitas)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,12 +292,12 @@ msgstr "Dividita"
msgid "Share"
msgstr "Kunhavigi"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Eraro"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Eraro dum kunhavigo"
@@ -325,107 +325,116 @@ msgstr "Kunhavigi kun uzanto aŭ grupo..."
msgid "Share link"
msgstr "Konhavigi ligilon"
-#: js/share.js:223
-msgid "Password protect"
-msgstr "Protekti per pasvorto"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Pasvorto"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "Protekti per pasvorto"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Pasvorto"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "Retpoŝti la ligilon al ulo"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Sendi"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Agordi limdaton"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Limdato"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Kunhavigi per retpoŝto:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Ne troviĝis gento"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Rekunhavigo ne permesatas"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Kunhavigita en {item} kun {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Malkunhavigi"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "avizi per retpoŝto"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "povas redakti"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "alirkontrolo"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "krei"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "ĝisdatigi"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "forigi"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "kunhavigi"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protektita per pasvorto"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Eraro dum malagordado de limdato"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Eraro dum agordado de limdato"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sendante..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "La retpoŝtaĵo sendiĝis"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Averto"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 6c9c1ef999..6a64b8e66b 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
msgid "Allow links"
msgstr "Kapabligi ligilojn"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Kapabligi rekunhavigon"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Kapabligi rekunhavigon"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/es/core.po b/l10n/es/core.po
index bb89a59171..7768754ba3 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: juanman \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -72,79 +72,79 @@ msgstr "No hay disponible una imagen temporal de perfil, pruebe de nuevo"
msgid "No crop data provided"
msgstr "No se proporcionó datos del recorte"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Viernes"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Enero"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrero"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Noviembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Diciembre"
@@ -204,75 +204,75 @@ msgstr "el año pasado"
msgid "years ago"
msgstr "hace años"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seleccionar"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seleccionar"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error cargando plantilla del mensaje: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de archivo"
msgstr[1] "{count} conflictos de archivo"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "On conflicto de archivo"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nuevos Archivos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Archivos ya existentes"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "¿Que archivos deseas mantener?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(seleccionados todos)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error cargando plantilla de archivo existente"
@@ -304,12 +304,12 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Error al compartir"
@@ -337,107 +337,116 @@ msgstr "Compartido con el usuario o con el grupo ..."
msgid "Share link"
msgstr "Enlace compartido"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Protección con contraseña"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Contraseña"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Enviar enlace por correo electrónico a una persona"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Establecer fecha de caducidad"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Fecha de caducidad"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Compartir por correo electrónico:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "No se encontró gente"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "No se permite compartir de nuevo"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notificar por correo electrónico"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "eliminar"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protegido con contraseña"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Error eliminando fecha de caducidad"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Error estableciendo fecha de caducidad"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Correo electrónico enviado"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Precaución"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 3ef0d924ef..21ddb2692d 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -22,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -115,13 +115,13 @@ msgstr "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Claves de cifrado eliminadas permanentemente"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -141,13 +141,13 @@ msgstr "No se pudo eliminar el usuario"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Copia de seguridad restaurada"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador."
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -204,7 +204,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
msgid "Unable to change password"
msgstr "No se ha podido cambiar la contraseña"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Enviando..."
@@ -290,11 +290,11 @@ msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiem
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Eliminar claves de cifrado."
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Restaurar claves de cifrado."
#: js/users.js:47
msgid "deleted"
@@ -529,62 +529,53 @@ msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
msgid "Allow links"
msgstr "Permitir enlaces"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Permitir subidas públicas"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permitir re-compartición"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir a los usuarios compartir con cualquier persona"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Permitir notificaciones por correo electrónico"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Establecer fecha de caducidad predeterminada"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Caduca luego de"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "días"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Imponer fecha de caducidad"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Permitir re-compartición"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Permitir a los usuarios compartir con cualquier persona"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Permitir notificaciones por correo electrónico"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Archivos compartidos caducan luego de N días"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos"
#: templates/admin.php:278
msgid "Security"
@@ -855,11 +846,11 @@ msgstr ""
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Restaurar claves de cifrado"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Eliminar claves de cifrado"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 9b9c52050e..8b17445ec2 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr "No hay una imágen temporal del perfil disponible, intente de nuevo"
msgid "No crop data provided"
msgstr "No se proveyeron datos de recorte"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Viernes"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "enero"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "febrero"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "mayo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "septiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "noviembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "diciembre"
@@ -192,75 +192,75 @@ msgstr "el año pasado"
msgid "years ago"
msgstr "años atrás"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Elegir"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error cargando la plantilla del selector de archivo: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Elegir"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error cargando la plantilla del selector de archivo: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error cargando la plantilla del mensaje: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "un archivo en conflicto"
msgstr[1] "{count} archivos en conflicto"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un archivo en conflicto"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nuevos archivos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "¿Qué archivos deseas retener?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todos están seleccionados)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error cargando la plantilla de archivo existente"
@@ -292,12 +292,12 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Error al compartir"
@@ -325,107 +325,116 @@ msgstr "Compartir con usuario o grupo ..."
msgid "Share link"
msgstr "Compartir vínculo"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Proteger con contraseña "
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Contraseña"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Enviar el enlace por e-mail."
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Mandar"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Asignar fecha de vencimiento"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Fecha de vencimiento"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Compartir a través de e-mail:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "No se encontraron usuarios"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "No se permite volver a compartir"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notificar por correo"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "podés editar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "borrar"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protegido por contraseña"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Error al remover la fecha de vencimiento"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Error al asignar fecha de vencimiento"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Mandando..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "e-mail mandado"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Atención"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 5bdf707f1d..1a6714f386 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -193,7 +193,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero las claves de encrip
msgid "Unable to change password"
msgstr "Imposible cambiar la contraseña"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Enviando..."
@@ -518,62 +518,53 @@ msgstr "Permitir a las aplicaciones usar la Share API"
msgid "Allow links"
msgstr "Permitir enlaces"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir enlaces públicos"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Permitir subidas públicas"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios públicos compartidos"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permitir Re-Compartir"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Permite a los usuarios volver a compartir items que les fueron compartidos"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir a los usuarios compartir con cualquiera."
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Permitir a los usuarios compartir sólo con los de sus mismos grupos"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Permitir notificaciones por correo"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir enlaces públicos"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Permitir Re-Compartir"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Permite a los usuarios volver a compartir items que les fueron compartidos"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Permitir a los usuarios compartir con cualquiera."
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Permitir a los usuarios compartir sólo con los de sus mismos grupos"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Permitir notificaciones por correo"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+msgid "Allow users to send mail notification for shared files"
+msgstr "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/es_CL/core.po b/l10n/es_CL/core.po
index 8bf1d3bba5..e73ac21e4b 100644
--- a/l10n/es_CL/core.po
+++ b/l10n/es_CL/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Viernes"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Enero"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrero"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Noviembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Diciembre"
@@ -191,75 +191,75 @@ msgstr "último año"
msgid "years ago"
msgstr "años anteriores"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choose"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choose"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,12 +291,12 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Ocurrió un error mientras compartía"
@@ -324,107 +324,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Clave"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Clave"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po
index 48192c1026..00ac4887e0 100644
--- a/l10n/es_CL/settings.po
+++ b/l10n/es_CL/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/es_CO/core.po b/l10n/es_CO/core.po
index d08261ee29..927e26997d 100644
--- a/l10n/es_CO/core.po
+++ b/l10n/es_CO/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -190,75 +190,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/es_CO/settings.po b/l10n/es_CO/settings.po
index 318732bf0f..a863a52cdd 100644
--- a/l10n/es_CO/settings.po
+++ b/l10n/es_CO/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/es_CR/core.po b/l10n/es_CR/core.po
index bc873a1313..fa46dbdcfe 100644
--- a/l10n/es_CR/core.po
+++ b/l10n/es_CR/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/es_CR/settings.po b/l10n/es_CR/settings.po
index 22ab9f64d3..886df61e54 100644
--- a/l10n/es_CR/settings.po
+++ b/l10n/es_CR/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/es_EC/core.po b/l10n/es_EC/core.po
index 14c6cc8758..d0543b99c4 100644
--- a/l10n/es_EC/core.po
+++ b/l10n/es_EC/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -190,75 +190,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/es_EC/settings.po b/l10n/es_EC/settings.po
index c12f94eaa4..502a6739dc 100644
--- a/l10n/es_EC/settings.po
+++ b/l10n/es_EC/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index f677d8b4d8..4e7318adaf 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr "No hay disponible una imagen temporal de perfil, pruebe de nuevo"
msgid "No crop data provided"
msgstr "No se proporcionó datos del recorte"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Viernes"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Enero"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrero"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Noviembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Diciembre"
@@ -190,75 +190,75 @@ msgstr "el año pasado"
msgid "years ago"
msgstr "años antes"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seleccionar"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seleccionar"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error cargando plantilla del mensaje: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de archivo"
msgstr[1] "{count} conflictos de archivo"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflicto de archivo"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "¿Que archivos deseas mantener?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todos seleccionados)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error cargando plantilla de archivo existente"
@@ -290,12 +290,12 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Error al compartir"
@@ -323,107 +323,116 @@ msgstr "Compartido con el usuario o con el grupo …"
msgid "Share link"
msgstr "Enlace compartido"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Protección con contraseña"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Contraseña"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Enviar enlace por correo electrónico a una persona"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Establecer fecha de caducidad"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Fecha de caducidad"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Compartir por correo electrónico:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "No se encontró gente"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "No se permite compartir de nuevo"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notificar al usuario por correo electrónico"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "eliminar"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protegido con contraseña"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Error eliminando fecha de caducidad"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Error estableciendo fecha de caducidad"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Correo electrónico enviado"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Precaución"
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
index a9128ba63a..727af7f58b 100644
--- a/l10n/es_MX/settings.po
+++ b/l10n/es_MX/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
msgid "Unable to change password"
msgstr "No se ha podido cambiar la contraseña"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
msgid "Allow links"
msgstr "Permitir enlaces"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Permitir subidas públicas"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permitir re-compartición"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir a los usuarios compartir con cualquier persona"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Permitir notificaciones por correo electrónico"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Permitir re-compartición"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Permitir a los usuarios compartir con cualquier persona"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Permitir notificaciones por correo electrónico"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/es_PE/core.po b/l10n/es_PE/core.po
index 624902a6f4..f0936f5741 100644
--- a/l10n/es_PE/core.po
+++ b/l10n/es_PE/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -190,75 +190,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/es_PE/settings.po b/l10n/es_PE/settings.po
index e23dbcbe64..458ba9e96f 100644
--- a/l10n/es_PE/settings.po
+++ b/l10n/es_PE/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/es_UY/core.po b/l10n/es_UY/core.po
index e755636d31..66032609e9 100644
--- a/l10n/es_UY/core.po
+++ b/l10n/es_UY/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -190,75 +190,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/es_UY/settings.po b/l10n/es_UY/settings.po
index 01bcab96d7..1a6cfcfa6c 100644
--- a/l10n/es_UY/settings.po
+++ b/l10n/es_UY/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 2407bdd6c8..f5e8af026a 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: pisike.sipelgas \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -60,79 +60,79 @@ msgstr "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti"
msgid "No crop data provided"
msgstr "Lõikeandmeid ei leitud"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Pühapäev"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Esmaspäev"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Teisipäev"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Kolmapäev"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Neljapäev"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Reede"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Laupäev"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Jaanuar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Veebruar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Märts"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprill"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juuni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juuli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktoober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Detsember"
@@ -192,75 +192,75 @@ msgstr "viimasel aastal"
msgid "years ago"
msgstr "aastat tagasi"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vali"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Viga failivalija malli laadimisel: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Jah"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vali"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Viga failivalija malli laadimisel: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Viga sõnumi malli laadimisel: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} failikonflikt"
msgstr[1] "{count} failikonflikti"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Üks failikonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Uued failid"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Juba olemasolevad failid"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Milliseid faile sa soovid alles hoida?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Loobu"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Jätka"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(kõik valitud)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valitud)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Viga faili olemasolu malli laadimisel"
@@ -292,12 +292,12 @@ msgstr "Jagatud"
msgid "Share"
msgstr "Jaga"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Viga"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Viga jagamisel"
@@ -325,107 +325,116 @@ msgstr "Jaga kasutaja või grupiga ..."
msgid "Share link"
msgstr "Jaga linki"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Parooliga kaitstud"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Parool"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Luba avalik üleslaadimine"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Saada link isikule e-postiga"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Saada"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Määra aegumise kuupäev"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Aegumise kuupäev"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Jaga e-postiga:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Ühtegi inimest ei leitud"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupp"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Edasijagamine pole lubatud"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Jagatud {item} kasutajaga {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Lõpeta jagamine"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "teavita e-postiga"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "saab muuta"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "ligipääsukontroll"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "loo"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "uuenda"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "kustuta"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "jaga"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Parooliga kaitstud"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Viga aegumise kuupäeva eemaldamisel"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Viga aegumise kuupäeva määramisel"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Saatmine ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-kiri on saadetud"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Hoiatus"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 145b0f1635..50c4a67795 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -191,7 +191,7 @@ msgstr "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuen
msgid "Unable to change password"
msgstr "Ei suuda parooli muuta"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Saadan..."
@@ -516,62 +516,53 @@ msgstr "Luba rakendustel kasutada Share API-t"
msgid "Allow links"
msgstr "Luba lingid"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Luba avalikud üleslaadimised"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse "
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Luba edasijagamine"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Luba kasutajatel kõigiga jagada"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Luba teavitused e-postiga"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Aegu pärast"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "päeva"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Luba edasijagamine"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Luba kasutajatel kõigiga jagada"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Luba teavitused e-postiga"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Peata jagamine N päeva möödudes"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 8c08bca711..f9796e132e 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: Hey_neken \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -61,79 +61,79 @@ msgstr "Ez dago behin-behineko profil irudirik, saiatu berriro"
msgid "No crop data provided"
msgstr "Ez da ebaketarako daturik zehaztu"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Igandea"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Astelehena"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Asteartea"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Asteazkena"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Osteguna"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Ostirala"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Larunbata"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Urtarrila"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Otsaila"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Martxoa"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Apirila"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maiatza"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Ekaina"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Uztaila"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Abuztua"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Iraila"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Urria"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Azaroa"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Abendua"
@@ -193,75 +193,75 @@ msgstr "joan den urtean"
msgid "years ago"
msgstr "urte"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Aukeratu"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Bai"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ez"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Aukeratu"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ados"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Errorea mezu txantiloia kargatzean: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "fitxategi {count}ek konfliktua sortu du"
msgstr[1] "{count} fitxategik konfliktua sortu dute"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Fitxategi batek konfliktua sortu du"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Fitxategi Berriak"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Dagoeneko existitzen diren fitxategiak"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Ze fitxategi mantendu nahi duzu?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Jarraitu"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(denak hautatuta)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} hautatuta)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Errorea fitxategia existitzen da txantiloiak kargatzerakoan"
@@ -293,12 +293,12 @@ msgstr "Elkarbanatuta"
msgid "Share"
msgstr "Elkarbanatu"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Errorea"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Errore bat egon da elkarbanatzean"
@@ -326,107 +326,116 @@ msgstr "Elkarbanatu erabiltzaile edo taldearekin..."
msgid "Share link"
msgstr "Elkarbanatu lotura"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Babestu pasahitzarekin"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Pasahitza"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Gaitu igotze publikoa"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Postaz bidali lotura "
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Bidali"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Ezarri muga data"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Muga data"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Elkarbanatu eposta bidez:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Ez da inor aurkitu"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "taldea"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Berriz elkarbanatzea ez dago baimendua"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "{user}ekin {item}-n elkarbanatuta"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Ez elkarbanatu"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "jakinarazi eposta bidez"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "editatu dezake"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "sarrera kontrola"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "sortu"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "eguneratu"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "ezabatu"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "elkarbanatu"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Pasahitzarekin babestuta"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Errorea izan da muga data kentzean"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Errore bat egon da muga data ezartzean"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Bidaltzen ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Eposta bidalia"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Abisua"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 962746ae2d..ff1ac45881 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -192,7 +192,7 @@ msgstr ""
msgid "Unable to change password"
msgstr "Ezin izan da pasahitza aldatu"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -517,61 +517,52 @@ msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
msgid "Allow links"
msgstr "Baimendu loturak"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Baimendu igoera publikoak"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Baimendu birpartekatzea"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Baimendu posta bidezko jakinarazpenak"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Baimendu birpartekatzea"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Baimendu posta bidezko jakinarazpenak"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index dff837b3f7..74c05e1537 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 9b588cb92d..9a41c2be81 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index ba263522ce..9ffacb3454 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "یکشنبه"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "دوشنبه"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "سه شنبه"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "چهارشنبه"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "پنجشنبه"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "جمعه"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "شنبه"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ژانویه"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "فبریه"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "مارس"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "آوریل"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "می"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ژوئن"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "جولای"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "آگوست"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "سپتامبر"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "اکتبر"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "نوامبر"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "دسامبر"
@@ -187,74 +187,74 @@ msgstr "سال قبل"
msgid "years ago"
msgstr "سالهای قبل"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "انتخاب کردن"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "بله"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "نه"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "انتخاب کردن"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "قبول"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "فایل های جدید"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "منصرف شدن"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -286,12 +286,12 @@ msgstr "اشتراک گذاشته شده"
msgid "Share"
msgstr "اشتراکگذاری"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "خطا"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "خطا درحال به اشتراک گذاشتن"
@@ -319,107 +319,116 @@ msgstr ""
msgid "Share link"
msgstr "اشتراک گذاشتن لینک"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "نگهداری کردن رمز عبور"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "گذرواژه"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "اجازه آپلود عمومی"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "پیوند ایمیل برای شخص."
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "ارسال"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "تنظیم تاریخ انقضا"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "تاریخ انقضا"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "از طریق ایمیل به اشتراک بگذارید :"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "کسی یافت نشد"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "گروه"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "لغو اشتراک"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "می توان ویرایش کرد"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "کنترل دسترسی"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "ایجاد"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "به روز"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "پاک کردن"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "به اشتراک گذاشتن"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "نگهداری از رمز عبور"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "خطا در تنظیم نکردن تاریخ انقضا "
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "خطا در تنظیم تاریخ انقضا"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "درحال ارسال ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "ایمیل ارسال شد"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "اخطار"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 48968e563e..d1426b6375 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -192,7 +192,7 @@ msgstr "سیستم مدیریتی امکان تغییر رمز را پشتیبا
msgid "Unable to change password"
msgstr "نمیتوان رمز را تغییر داد"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -517,61 +517,52 @@ msgstr "اجازه ی برنامه ها برای استفاده از API اشت
msgid "Allow links"
msgstr "اجازه ی لینک ها"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "اجازه بارگذاری عمومی"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "به کاربران اجازه داده شود که امکان بارگذاری در پوشه هایی که بصورت عمومی به اشتراک گذاشته اند را برای سایرین فعال سازند"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "مجوز اشتراک گذاری مجدد"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "اجازه به کابران برای اشتراک گذاری با همه"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "مجاز نمودن اطلاع رسانی توسط ایمیل"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "مجوز اشتراک گذاری مجدد"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "اجازه به کابران برای اشتراک گذاری با همه"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "مجاز نمودن اطلاع رسانی توسط ایمیل"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index ab2ca35f0c..4d64f1173c 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -61,79 +61,79 @@ msgstr "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen"
msgid "No crop data provided"
msgstr "Puutteellinen tieto"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "sunnuntai"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "maanantai"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "tiistai"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "keskiviikko"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "torstai"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "perjantai"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "lauantai"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "tammikuu"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "helmikuu"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "maaliskuu"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "huhtikuu"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "toukokuu"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "kesäkuu"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "heinäkuu"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "elokuu"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "syyskuu"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "lokakuu"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "marraskuu"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "joulukuu"
@@ -193,75 +193,75 @@ msgstr "viime vuonna"
msgid "years ago"
msgstr "vuotta sitten"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Valitse"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Virhe ladatessa tiedostopohjia: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Kyllä"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Valitse"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Virhe ladatessa tiedostopohjia: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Virhe ladatessa viestipohjaa: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} tiedoston ristiriita"
msgstr[1] "{count} tiedoston ristiriita"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Yhden tiedoston ristiriita"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Uudet tiedostot"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Jo olemassa olevat tiedostot"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Mitkä tiedostot haluat säilyttää?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Peru"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Jatka"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(kaikki valittu)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valittu)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Virhe ladatessa mallipohjaa"
@@ -293,12 +293,12 @@ msgstr "Jaettu"
msgid "Share"
msgstr "Jaa"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Virhe"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Virhe jaettaessa"
@@ -326,107 +326,116 @@ msgstr "Jaa käyttäjän tai ryhmän kanssa…"
msgid "Share link"
msgstr "Jaa linkki"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Suojaa salasanalla"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Salasana"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Salli julkinen lähetys"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Lähetä linkki sähköpostitse"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Lähetä"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Aseta päättymispäivä"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Päättymispäivä"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Jaa sähköpostilla:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Henkilöitä ei löytynyt"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "ryhmä"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Jakaminen uudelleen ei ole salittu"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "{item} on jaettu {user} kanssa"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Peru jakaminen"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "ilmoita sähköpostitse"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "voi muokata"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "Pääsyn hallinta"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "luo"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "päivitä"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "poista"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "jaa"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Salasanasuojattu"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Virhe purettaessa eräpäivää"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Virhe päättymispäivää asettaessa"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Lähetetään..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Sähköposti lähetetty"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Varoitus"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index d08fd530c0..d32e02ada3 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -101,7 +101,7 @@ msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yr
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Salausavaimet poistettiin pysyvästi"
#: ajax/deletekeys.php:16
msgid ""
@@ -127,7 +127,7 @@ msgstr "Käyttäjän poisto epäonnistui"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Varmuuskopiot palautettiin onnistuneesti"
#: ajax/restorekeys.php:23
msgid ""
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr "Salasanan vaihto ei onnistunut"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Lähetetään..."
@@ -515,62 +515,53 @@ msgstr "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa"
msgid "Allow links"
msgstr "Salli linkit"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Salli julkiset lähetykset"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Salli uudelleenjakaminen"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Salli sähköposti-ilmoitukset"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Aseta oletusvanhenemispäivä"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Vanhenna"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "päivän jälkeen"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Pakota vanhenemispäivä"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Salli uudelleenjakaminen"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Salli sähköposti-ilmoitukset"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Vanhenna jaot oletuksena N päivän jälkeen"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista"
#: templates/admin.php:278
msgid "Security"
@@ -841,11 +832,11 @@ msgstr ""
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Palauta salausavaimet"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Poista salausavaimet"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index f9a37f6386..206a814ae2 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -66,79 +66,79 @@ msgstr "Aucune image temporaire disponible pour le profil. Essayez à nouveau."
msgid "No crop data provided"
msgstr "Aucune donnée de culture fournie"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Dimanche"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lundi"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Mardi"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mercredi"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jeudi"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Vendredi"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samedi"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "janvier"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "février"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "avril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "juin"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "juillet"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "août"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "septembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "octobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "décembre"
@@ -198,75 +198,75 @@ msgstr "l'année dernière"
msgid "years ago"
msgstr "il y a plusieurs années"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choisir"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Oui"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choisir"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Erreur de chargement du modèle de message : {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} fichier en conflit"
msgstr[1] "{count} fichiers en conflit"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflit de fichier"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nouveaux fichiers"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Fichiers déjà existants"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Quels fichiers désirez-vous garder ?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annuler"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Poursuivre"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(tous sélectionnés)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} sélectionnés)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Erreur de chargement du modèle de fichier existant"
@@ -298,12 +298,12 @@ msgstr "Partagé"
msgid "Share"
msgstr "Partager"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Erreur"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Erreur lors de la mise en partage"
@@ -331,107 +331,116 @@ msgstr "Partager avec un utilisateur ou un groupe..."
msgid "Share link"
msgstr "Partager le lien"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Protéger par un mot de passe"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Mot de passe"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Autoriser l'upload par les utilisateurs non enregistrés"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Envoyez le lien par email"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Envoyer"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Spécifier la date d'expiration"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Date d'expiration"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Partager via e-mail :"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Aucun utilisateur trouvé"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "groupe"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Le repartage n'est pas autorisé"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Partagé dans {item} avec {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Ne plus partager"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "Notifier par email"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "édition autorisée"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "contrôle des accès"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "créer"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "mettre à jour"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "supprimer"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "partager"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "En cours d'envoi ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email envoyé"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Attention"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 2997ac3913..bc905d4c90 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ReDiX , 2014
# timelord , 2014
# Christophe Lherieau , 2014
# ptit_boogy , 2014
@@ -10,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: ptit_boogy \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-14 09:28+0000\n"
+"Last-Translator: ReDiX \n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +39,7 @@ msgstr "Clé"
#: appinfo/app.php:42
msgid "Secret"
-msgstr ""
+msgstr "Secret"
#: appinfo/app.php:43 appinfo/app.php:51
msgid "Bucket"
@@ -54,15 +55,15 @@ msgstr "Clé d'accès"
#: appinfo/app.php:50
msgid "Secret Key"
-msgstr ""
+msgstr "Clé secrète"
#: appinfo/app.php:52
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Nom machine (optionnel)"
#: appinfo/app.php:53
msgid "Port (optional)"
-msgstr ""
+msgstr "Port (optionnel)"
#: appinfo/app.php:54
msgid "Region (optional)"
@@ -70,7 +71,7 @@ msgstr ""
#: appinfo/app.php:55
msgid "Enable SSL"
-msgstr ""
+msgstr "Activer SSL"
#: appinfo/app.php:56
msgid "Enable Path Style"
@@ -78,7 +79,7 @@ msgstr ""
#: appinfo/app.php:63
msgid "App key"
-msgstr ""
+msgstr "Clé App"
#: appinfo/app.php:64
msgid "App secret"
@@ -102,7 +103,7 @@ msgstr "Mot de passe"
#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
#: appinfo/app.php:134 appinfo/app.php:154
msgid "Root"
-msgstr ""
+msgstr "Root"
#: appinfo/app.php:77
msgid "Secure ftps://"
@@ -110,7 +111,7 @@ msgstr ""
#: appinfo/app.php:84
msgid "Client ID"
-msgstr ""
+msgstr "ID Client"
#: appinfo/app.php:85
msgid "Client secret"
@@ -122,7 +123,7 @@ msgstr ""
#: appinfo/app.php:94
msgid "Username (required)"
-msgstr ""
+msgstr "Nom d'utilisation (requis)"
#: appinfo/app.php:95
msgid "Bucket (required)"
@@ -134,7 +135,7 @@ msgstr ""
#: appinfo/app.php:97
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "Clé API (requis pour Rackspace Cloud Files)"
#: appinfo/app.php:98
msgid "Tenantname (required for OpenStack Object Storage)"
@@ -142,7 +143,7 @@ msgstr ""
#: appinfo/app.php:99
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Mot de passe (requis pour OpenStack Object Storage)"
#: appinfo/app.php:100
msgid "Service Name (required for OpenStack Object Storage)"
@@ -200,29 +201,29 @@ msgstr "Erreur lors de la configuration du support de stockage Google Drive"
msgid "Saved"
msgstr "Sauvegarder"
-#: lib/config.php:597
+#: lib/config.php:589
msgid "Note: "
msgstr "Attention :"
-#: lib/config.php:607
+#: lib/config.php:599
msgid " and "
msgstr "et"
-#: lib/config.php:629
+#: lib/config.php:621
#, php-format
msgid ""
"Note: The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "Attention : Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer."
-#: lib/config.php:631
+#: lib/config.php:623
#, php-format
msgid ""
"Note: The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "Attention : Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer."
-#: lib/config.php:633
+#: lib/config.php:625
#, php-format
msgid ""
"Note: \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 110a55e4ae..1e20086a84 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr "L'infrastructure d'arrière-plan ne supporte pas la modification de mot
msgid "Unable to change password"
msgstr "Impossible de modifier le mot de passe"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Envoi en cours..."
@@ -526,62 +526,53 @@ msgstr "Autoriser les applications à utiliser l'API de partage"
msgid "Allow links"
msgstr "Autoriser les liens"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Autoriser les téléversements publics"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Autoriser le repartage"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Autoriser les utilisateurs à partager avec tout le monde"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Autoriser les notifications par couriel"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Spécifier la date d'expiration par défaut"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Expire après"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "jours"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Impose la date d'expiration"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Autoriser le repartage"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Autoriser les utilisateurs à partager avec tout le monde"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Autoriser les notifications par couriel"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Par défaut, les partages expireront après N jours"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/fr_CA/core.po b/l10n/fr_CA/core.po
index 53de5d6a0d..172a28fe18 100644
--- a/l10n/fr_CA/core.po
+++ b/l10n/fr_CA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/fr_CA/settings.po b/l10n/fr_CA/settings.po
index 5db75bf8c1..483f1dd350 100644
--- a/l10n/fr_CA/settings.po
+++ b/l10n/fr_CA/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 8a0e9a4c29..07963aad94 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo"
msgid "No crop data provided"
msgstr "Non indicou como recortar"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "luns"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "mércores"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "xoves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "venres"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "xaneiro"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "febreiro"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "maio"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "xuño"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "xullo"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "setembro"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "outubro"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "novembro"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "decembro"
@@ -192,75 +192,75 @@ msgstr "último ano"
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escoller"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Produciuse un erro ao cargar o modelo do selector: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escoller"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Produciuse un erro ao cargar o modelo do selector: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Produciuse un erro ao cargar o modelo da mensaxe: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflito de ficheiro"
msgstr[1] "{count} conflitos de ficheiros"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflito de ficheiro"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Ficheiros novos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Ficheiros xa existentes"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Que ficheiros quere conservar?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todo o seleccionado)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente"
@@ -292,12 +292,12 @@ msgstr "Compartir"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Erro"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Produciuse un erro ao compartir"
@@ -325,107 +325,116 @@ msgstr "Compartir cun usuario ou grupo ..."
msgid "Share link"
msgstr "Ligazón para compartir"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Protexido con contrasinais"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Contrasinal"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Permitir o envío público"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Enviar ligazón por correo"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Definir a data de caducidade"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data de caducidade"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Compartir por correo:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Non se atopou xente"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Non se permite volver a compartir"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Deixar de compartir"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notificar por correo"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "eliminar"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protexido con contrasinal"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Produciuse un erro ao retirar a data de caducidade"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Produciuse un erro ao definir a data de caducidade"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Correo enviado"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Aviso"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 6316b5a4d0..352dad1374 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -102,13 +102,13 @@ msgstr "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "As chaves de cifrado foron eliminadas permanentemente"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -128,13 +128,13 @@ msgstr "Non é posíbel eliminar o usuario"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "As copias de seguranza foron restauradas satisfactoriamente"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -191,7 +191,7 @@ msgstr "A infraestrutura non admite o cambio de contrasinal, mais a chave de cif
msgid "Unable to change password"
msgstr "Non é posíbel cambiar o contrasinal"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Enviando..."
@@ -277,11 +277,11 @@ msgstr "Descifrando ficheiros... isto pode levar un anaco."
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Eliminar permanentemente as chaves de cifrado"
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Restaurar as chaves de cifrado"
#: js/users.js:47
msgid "deleted"
@@ -516,62 +516,53 @@ msgstr "Permitir que os aplicativos empreguen o API para compartir"
msgid "Allow links"
msgstr "Permitir ligazóns"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Permitir os envíos públicos"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permitir compartir"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir que os usuarios compartan con calquera"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Permitir que os usuarios compartan só cos usuarios dos seus grupos"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Permitir o envío de notificacións por correo"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Definir a data predeterminada de caducidade"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Caduca após"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "días"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Obrigar a data de caducidade"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Permitir compartir"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Permitir que os usuarios compartan con calquera"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Permitir que os usuarios compartan só cos usuarios dos seus grupos"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Permitir o envío de notificacións por correo"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "As comparticións, de xeito predeterminado, caducan aos N días"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos"
#: templates/admin.php:278
msgid "Security"
@@ -838,15 +829,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros."
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Restaurar as chaves de cifrado"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Eliminar as chaves de cifrado"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 7a38476adf..2d7a153ce6 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "יום ראשון"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "יום שני"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "יום שלישי"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "יום רביעי"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "יום חמישי"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "יום שישי"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "שבת"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ינואר"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "פברואר"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "מרץ"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "אפריל"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "מאי"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "יוני"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "יולי"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "אוגוסט"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ספטמבר"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "אוקטובר"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "נובמבר"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "דצמבר"
@@ -192,75 +192,75 @@ msgstr "שנה שעברה"
msgid "years ago"
msgstr "שנים"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "בחירה"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "כן"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "לא"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "בחירה"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "בסדר"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "קבצים חדשים"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ביטול"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,12 +292,12 @@ msgstr "שותף"
msgid "Share"
msgstr "שתף"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "שגיאה"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "שגיאה במהלך השיתוף"
@@ -325,107 +325,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "הגנה בססמה"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "סיסמא"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "הגנה בססמה"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "סיסמא"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "שליחת קישור בדוא״ל למשתמש"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "שליחה"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "הגדרת תאריך תפוגה"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "תאריך התפוגה"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "שיתוף באמצעות דוא״ל:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "לא נמצאו אנשים"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "קבוצה"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "אסור לעשות שיתוף מחדש"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "שותף תחת {item} עם {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "הסר שיתוף"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "ניתן לערוך"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "בקרת גישה"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "יצירה"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "עדכון"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "מחיקה"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "שיתוף"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "מוגן בססמה"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "אירעה שגיאה בביטול תאריך התפוגה"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "מתבצעת שליחה ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "הודעת הדוא״ל נשלחה"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "אזהרה"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 713c768cdb..b35c0583a7 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr "לאפשר ליישום להשתמש ב־API השיתוף"
msgid "Allow links"
msgstr "לאפשר קישורים"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "לאפשר למשתמשים לשתף פריטים "
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "לאפשר שיתוף מחדש"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "לאפשר למשתמשים לשתף עם כל אחד"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "לאפשר למשתמשים לשתף פריטים "
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "לאפשר שיתוף מחדש"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "לאפשר למשתמשים לשתף עם כל אחד"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 466aa3fb2e..99fcd94da4 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "रविवार"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "सोमवार"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "मंगलवार"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "बुधवार"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "बृहस्पतिवार"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "शुक्रवार"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "शनिवार"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "जनवरी"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "फरवरी"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "मार्च"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "अप्रैल"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "मई"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "जून"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "जुलाई"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "अगस्त"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "सितम्बर"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "अक्टूबर"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "नवंबर"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "दिसम्बर"
@@ -192,75 +192,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,12 +292,12 @@ msgstr ""
msgid "Share"
msgstr "साझा करें"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "त्रुटि"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -325,107 +325,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "पासवर्ड"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "पासवर्ड"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "भेजें"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "कोई व्यक्ति नहीं मिले "
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "भेजा जा रहा है"
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "ईमेल भेज दिया गया है "
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "चेतावनी "
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index d6f2958508..b0ab46006c 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/hi_IN/core.po b/l10n/hi_IN/core.po
index 4f30be9a5f..70941c5f9b 100644
--- a/l10n/hi_IN/core.po
+++ b/l10n/hi_IN/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -190,75 +190,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/hi_IN/settings.po b/l10n/hi_IN/settings.po
index 638580cdb7..a9562862cb 100644
--- a/l10n/hi_IN/settings.po
+++ b/l10n/hi_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 71a6ffff17..baa0de0405 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "nedelja"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ponedeljak"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "utorak"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "srijeda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "četvrtak"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "petak"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "subota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Siječanj"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Veljača"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Ožujak"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Travanj"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Svibanj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Lipanj"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Srpanj"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Kolovoz"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Rujan"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Listopad"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Studeni"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Prosinac"
@@ -194,76 +194,76 @@ msgstr "prošlu godinu"
msgid "years ago"
msgstr "godina"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izaberi"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izaberi"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "U redu"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Odustani"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -295,12 +295,12 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Greška"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Greška prilikom djeljenja"
@@ -328,107 +328,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "Zaštiti lozinkom"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lozinka"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "Zaštiti lozinkom"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lozinka"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Postavi datum isteka"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Dijeli preko email-a:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Osobe nisu pronađene"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Ponovo dijeljenje nije dopušteno"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Makni djeljenje"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "može mjenjat"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "kreiraj"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "ažuriraj"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "izbriši"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "djeli"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Zaštita lozinkom"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Greška prilikom brisanja datuma isteka"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Greška prilikom postavljanja datuma isteka"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 4efb1c3b40..9f8ae978b0 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 5e59b299f9..c796c93422 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
-"Last-Translator: aries1980 \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -62,79 +62,79 @@ msgstr "Az átmeneti profil kép nem elérhető, próbáld újra"
msgid "No crop data provided"
msgstr "Vágáshoz nincs adat megadva"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "vasárnap"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "hétfő"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "kedd"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "szerda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "csütörtök"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "péntek"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "szombat"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "január"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "február"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "március"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "április"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "május"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "június"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "július"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "augusztus"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "szeptember"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "október"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "november"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "december"
@@ -194,75 +194,75 @@ msgstr "tavaly"
msgid "years ago"
msgstr "több éve"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Válasszon"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Nem sikerült betölteni a fájlkiválasztó sablont: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Igen"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nem"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Válasszon"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Nem sikerült betölteni a fájlkiválasztó sablont: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Nem sikerült betölteni az üzenet sablont: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} fájl ütközik"
msgstr[1] "{count} fájl ütközik"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Egy file ütközik"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Új fájlok"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "A fájlok már láteznek"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Melyik file-okat akarod megtartani?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Mégsem"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Folytatás"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(az összes ki lett választva)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} lett kiválasztva)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Hiba a létező sablon betöltésekor"
@@ -294,12 +294,12 @@ msgstr "Megosztott"
msgid "Share"
msgstr "Megosztás"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Hiba"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Nem sikerült létrehozni a megosztást"
@@ -327,107 +327,116 @@ msgstr "Megosztani egy felhasználóval vagy csoporttal ..."
msgid "Share link"
msgstr "Megosztás hivatkozással"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Jelszóval is védem"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Jelszó"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Feltöltést is engedélyezek"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Email címre küldjük el"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Küldjük el"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Legyen lejárati idő"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "A lejárati idő"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Megosztás emaillel:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Nincs találat"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "csoport"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Megosztva {item}-ben {user}-rel"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "A megosztás visszavonása"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "email értesítés"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "módosíthat"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "jogosultság"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "létrehoz"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "szerkeszt"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "töröl"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "megoszt"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Jelszóval van védve"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Nem sikerült a lejárati időt törölni"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Nem sikerült a lejárati időt beállítani"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Küldés ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Az emailt elküldtük"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Figyelmeztetés"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 5fc29a27b0..f7c56e51b3 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -193,7 +193,7 @@ msgstr "A back-end nem támogatja a jelszó módosítást, de felhasználó titk
msgid "Unable to change password"
msgstr "Nem sikerült megváltoztatni a jelszót"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -518,61 +518,52 @@ msgstr "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást
msgid "Allow links"
msgstr "Linkek engedélyezése"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Feltöltést engedélyezése mindenki számára"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Engedélyezni a felhasználóknak, hogy beállíithassák, hogy mások feltölthetnek a nyilvánosan megosztott mappákba."
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "A továbbosztás engedélyezése"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "A felhasználók bárkivel megoszthatják állományaikat"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "E-mail értesítések engedélyezése"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "A továbbosztás engedélyezése"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "A felhasználók bárkivel megoszthatják állományaikat"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "E-mail értesítések engedélyezése"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index dc7320cd4d..d7be4a3b98 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Կիրակի"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Երկուշաբթի"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Երեքշաբթի"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Չորեքշաբթի"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Հինգշաբթի"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Ուրբաթ"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Շաբաթ"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Հունվար"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Փետրվար"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Մարտ"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Ապրիլ"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Մայիս"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Հունիս"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Հուլիս"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Օգոստոս"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Սեպտեմբեր"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Հոկտեմբեր"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Նոյեմբեր"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Դեկտեմբեր"
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 9349848ce1..43e9637824 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index af29b28bc7..e760d7016e 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: giogio \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Dominica"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunedi"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martedi"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mercuridi"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jovedi"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Venerdi"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sabbato"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "januario"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februario"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Martio"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Augusto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembre"
@@ -191,75 +191,75 @@ msgstr "ultime anno"
msgid "years ago"
msgstr "annos passate"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seliger"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seliger"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de file"
msgstr[1] "{count} conflictos de file"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflicto de file"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nove files"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Files jam existente"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Qual files tu vole mantener?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancellar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error quando on incargava patrono de file existente"
@@ -291,12 +291,12 @@ msgstr "Compartite"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Error quando on compartiva"
@@ -324,107 +324,116 @@ msgstr "Compartir con usator o gruppo ..."
msgid "Share link"
msgstr "Compartir ligamine"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Protegite per contrasigno"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Contrasigno"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Permitter incargamento public"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Ligamine de e-posta a persona"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Invia"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Fixa data de expiration"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data de expiration"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Compartir via e-posta:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Il trovava nulle persona"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "gruppo"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Il non es permittite compartir plus que un vice"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Compartite in {item} con {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Leva compartir"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notificar per message de e-posta"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "pote modificar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "controlo de accesso"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "actualisar"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "deler"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Proteger con contrasigno"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Error quando on levava le data de expiration"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Error quando on fixava le data de expiration"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Inviante ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Message de e-posta inviate"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Aviso"
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index c348558a38..02c0a4e0f4 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 90d9937ee1..1fafb8e61e 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: Arif Budiman \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -59,79 +59,79 @@ msgstr "Tidak ada gambar profil sementara yang tersedia, coba lagi"
msgid "No crop data provided"
msgstr "Tidak ada data krop tersedia"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Minggu"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Senin"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Selasa"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Rabu"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Kamis"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Jumat"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sabtu"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januari"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februari"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Maret"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mei"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agustus"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
@@ -187,74 +187,74 @@ msgstr "tahun kemarin"
msgid "years ago"
msgstr "beberapa tahun lalu"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Pilih"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Galat memuat templat berkas pemilih: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Pilih"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Galat memuat templat berkas pemilih: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Oke"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Galat memuat templat pesan: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} berkas konflik"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Satu berkas konflik"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Berkas Baru"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Berkas sudah ada"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Berkas mana yang ingin anda pertahankan?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Lanjutkan"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(semua terpilih)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} terpilih)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Galat memuat templat berkas yang sudah ada"
@@ -286,12 +286,12 @@ msgstr "Dibagikan"
msgid "Share"
msgstr "Bagikan"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Galat"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Galat ketika membagikan"
@@ -319,107 +319,116 @@ msgstr "Bagikan dengan pengguna atau grup ..."
msgid "Share link"
msgstr "Bagikan tautan"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Lindungi dengan sandi"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Sandi"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Izinkan Unggahan Publik"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Emailkan tautan ini ke orang"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Kirim"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Atur tanggal kedaluwarsa"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Tanggal kedaluwarsa"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Bagian lewat email:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Tidak ada orang ditemukan"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grup"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Berbagi ulang tidak diizinkan"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Dibagikan dalam {item} dengan {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Batalkan berbagi"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notifikasi via email"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "dapat sunting"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "kontrol akses"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "buat"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "perbarui"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "hapus"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "bagikan"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Sandi dilindungi"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Galat ketika menghapus tanggal kedaluwarsa"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Galat ketika mengatur tanggal kedaluwarsa"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Mengirim ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email terkirim"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Peringatan"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 9907425200..d82aca0cd3 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengg
msgid "Unable to change password"
msgstr "Tidak dapat mengubah sandi"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
msgid "Allow links"
msgstr "Izinkan tautan"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Izinkan unggahan publik"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Izinkan pengguna memungkinkan orang lain untuk mengunggah kedalam folder berbagi publik mereka"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Izinkan pembagian ulang"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Izinkan pemberitahuan email"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Izinkan pembagian ulang"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Izinkan pemberitahuan email"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 49dc7a7d8b..5b7ad1efad 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sunnudagur"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Mánudagur"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Þriðjudagur"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miðvikudagur"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Fimmtudagur"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Föstudagur"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Laugardagur"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Janúar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrúar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Apríl"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maí"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Júní"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Júlí"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Ágúst"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Október"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Nóvember"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
@@ -191,75 +191,75 @@ msgstr "síðasta ári"
msgid "years ago"
msgstr "einhverjum árum"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Veldu"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Já"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Veldu"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Í lagi"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Hætta við"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,12 +291,12 @@ msgstr "Deilt"
msgid "Share"
msgstr "Deila"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Villa"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Villa við deilingu"
@@ -324,107 +324,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "Verja með lykilorði"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lykilorð"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "Verja með lykilorði"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lykilorð"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "Senda vefhlekk í tölvupóstu til notenda"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Senda"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Setja gildistíma"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Gildir til"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Deila með tölvupósti:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Engir notendur fundust"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Endurdeiling er ekki leyfð"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Deilt með {item} ásamt {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Hætta deilingu"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "getur breytt"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "aðgangsstýring"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "mynda"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "uppfæra"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "eyða"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "deila"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Verja með lykilorði"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Villa við að aftengja gildistíma"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Villa við að setja gildistíma"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sendi ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Tölvupóstur sendur"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Aðvörun"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 7a6d59fb95..77285274b7 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 0667701841..4212522030 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -62,79 +62,79 @@ msgstr "Nessuna immagine di profilo provvisoria disponibile, riprova"
msgid "No crop data provided"
msgstr "Dati di ritaglio non forniti"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domenica"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunedì"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martedì"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mercoledì"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Giovedì"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Venerdì"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sabato"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Gennaio"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febbraio"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprile"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maggio"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Giugno"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Luglio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Settembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Ottobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dicembre"
@@ -194,75 +194,75 @@ msgstr "anno scorso"
msgid "years ago"
msgstr "anni fa"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Scegli"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Errore durante il caricamento del modello del selettore file: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sì"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Scegli"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Errore durante il caricamento del modello del selettore file: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Errore durante il caricamento del modello di messaggio: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} file in conflitto"
msgstr[1] "{count} file in conflitto"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un file in conflitto"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "File nuovi"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "File già esistenti"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Quali file vuoi mantenere?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annulla"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continua"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(tutti i selezionati)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} selezionati)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Errore durante il caricamento del modello del file esistente"
@@ -294,12 +294,12 @@ msgstr "Condivisi"
msgid "Share"
msgstr "Condividi"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Errore"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Errore durante la condivisione"
@@ -327,107 +327,116 @@ msgstr "Condividi con utente o gruppo ..."
msgid "Share link"
msgstr "Condividi collegamento"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Proteggi con password"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Password"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Consenti caricamento pubblico"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Invia collegamento via email"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Invia"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Imposta data di scadenza"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data di scadenza"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Condividi tramite email:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Non sono state trovate altre persone"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "gruppo"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "La ri-condivisione non è consentita"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Condiviso in {item} con {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Rimuovi condivisione"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notifica tramite email"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "può modificare"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "controllo d'accesso"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "creare"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "aggiornare"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "elimina"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "condividi"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protetta da password"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Errore durante la rimozione della data di scadenza"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Errore durante l'impostazione della data di scadenza"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Invio in corso..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Messaggio inviato"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Avviso"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index a75f1045cc..401be04dd7 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -104,13 +104,13 @@ msgstr "Impossibile decifrare i tuoi file, controlla la password e prova ancora"
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Chiavi di cifratura eliminate definitivamente"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -130,13 +130,13 @@ msgstr "Impossibile eliminare l'utente"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Copie di sicurezza ripristinate correttamente"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -193,7 +193,7 @@ msgstr "Il motore non supporta la modifica della password, ma la chiave di cifra
msgid "Unable to change password"
msgstr "Impossibile cambiare la password"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Invio in corso..."
@@ -279,11 +279,11 @@ msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Elimina definitivamente le chiavi di cifratura."
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Ripristina le chiavi di cifratura."
#: js/users.js:47
msgid "deleted"
@@ -518,62 +518,53 @@ msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
msgid "Allow links"
msgstr "Consenti collegamenti"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Consenti caricamenti pubblici"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Consenti la ri-condivisione"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Consenti agli utenti di condividere con chiunque"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Consenti le notifiche tramite posta elettronica"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Consenti agli utenti di inviare email di notifica per i file condivisi"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Imposta data di scadenza predefinita"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Scadenza dopo"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "giorni"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Forza la data di scadenza"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Consenti la ri-condivisione"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Consenti agli utenti di condividere con chiunque"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Consenti le notifiche tramite posta elettronica"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Le condivisioni scadono in modo predefinito dopo N giorni"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Consenti agli utenti di inviare email di notifica per i file condivisi"
#: templates/admin.php:278
msgid "Security"
@@ -840,15 +831,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati."
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Ripristina chiavi di cifratura"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Elimina chiavi di cifratura"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/ja/core.po b/l10n/ja/core.po
index a23b394786..b7be43eb55 100644
--- a/l10n/ja/core.po
+++ b/l10n/ja/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: mikako\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -65,79 +65,79 @@ msgstr "一時的なプロファイル用画像が利用できません。もう
msgid "No crop data provided"
msgstr "クロップデータは提供されません"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "日"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "月"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "火"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "水"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "木"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "金"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "土"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "1月"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "2月"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "3月"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "4月"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "5月"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "6月"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "7月"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "8月"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "9月"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "10月"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "11月"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "12月"
@@ -193,74 +193,74 @@ msgstr "1年前"
msgid "years ago"
msgstr "数年前"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "選択"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "ファイル選択テンプレートの読み込みエラー: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "はい"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "いいえ"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "選択"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "ファイル選択テンプレートの読み込みエラー: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "メッセージテンプレートの読み込みエラー: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} ファイルが競合"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "1ファイルが競合"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "新しいファイル"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "ファイルがすでに存在します"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "どちらのファイルを保持したいですか?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "キャンセル"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "続ける"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(全て選択)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} 選択)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "既存ファイルのテンプレートの読み込みエラー"
@@ -292,12 +292,12 @@ msgstr "共有中"
msgid "Share"
msgstr "共有"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "エラー"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "共有でエラー発生"
@@ -325,107 +325,116 @@ msgstr "ユーザーもしくはグループと共有 ..."
msgid "Share link"
msgstr "URLで共有"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "パスワード保護"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "パスワード"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "アップロードを許可"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "メールリンク"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "送信"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "有効期限を設定"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "有効期限"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "メール経由で共有:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "ユーザーが見つかりません"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "グループ"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "再共有は許可されていません"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "{item} 内で {user} と共有中"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "共有解除"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "メールで通知"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "編集を許可"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "アクセス権限"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "作成"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "アップデート"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "削除"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "共有"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "パスワード保護"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "有効期限の未設定エラー"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "有効期限の設定でエラー発生"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "送信中..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "メールを送信しました"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "警告"
diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po
index 91700405a8..7451564f21 100644
--- a/l10n/ja/settings.po
+++ b/l10n/ja/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -106,13 +106,13 @@ msgstr "ファイルを復号化することができませんでした。パス
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "暗号化キーは完全に削除されます"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -132,13 +132,13 @@ msgstr "ユーザーを削除できません"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "バックアップの復元に成功しました"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -195,7 +195,7 @@ msgstr "バックエンドはパスワード変更をサポートしていませ
msgid "Unable to change password"
msgstr "パスワードを変更できません"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "送信中…"
@@ -281,11 +281,11 @@ msgstr "ファイルを複合中... しばらくお待ちください、この
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "暗号化キーを完全に削除します。"
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "暗号化キーを復元します。"
#: js/users.js:47
msgid "deleted"
@@ -520,62 +520,53 @@ msgstr "アプリからの共有APIの利用を許可する"
msgid "Allow links"
msgstr "リンクを許可する"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "ユーザーがリンクによりアイテムを公開することを許可する"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "パブリックなアップロードを許可"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "公開している共有フォルダーへのアップロードを共有しているメンバーにも許可"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "再共有を許可する"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "ユーザーが共有しているアイテムの再共有を許可する"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "ユーザーに誰とでも共有することを許可する"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "ユーザーにグループ内のユーザーとのみ共有を許可する"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "メール通知を許可"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "共有ファイルに関するメール通知の送信をユーザに許可する"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "有効期限の既定値を設定"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "無効になるまで"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "日"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "有効期限を反映させる"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "ユーザーがリンクによりアイテムを公開することを許可する"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "再共有を許可する"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "ユーザーが共有しているアイテムの再共有を許可する"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "ユーザーに誰とでも共有することを許可する"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "ユーザーにグループ内のユーザーとのみ共有を許可する"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "メール通知を許可"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "既定値では N 日後に共有を無効にします"
+msgid "Allow users to send mail notification for shared files"
+msgstr "共有ファイルに関するメール通知の送信をユーザに許可する"
#: templates/admin.php:278
msgid "Security"
@@ -842,15 +833,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。"
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "暗号化キーを復元する"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "暗号化キーを削除する"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/jv/core.po b/l10n/jv/core.po
index 64f25812fd..da6089d321 100644
--- a/l10n/jv/core.po
+++ b/l10n/jv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/jv/settings.po b/l10n/jv/settings.po
index 5b267e2b34..20319eda3e 100644
--- a/l10n/jv/settings.po
+++ b/l10n/jv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index eb209f9ebd..ef0399f24c 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "კვირა"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ორშაბათი"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "სამშაბათი"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "ოთხშაბათი"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ხუთშაბათი"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "პარასკევი"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "შაბათი"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "იანვარი"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "თებერვალი"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "მარტი"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "აპრილი"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "მაისი"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ივნისი"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ივლისი"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "აგვისტო"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "სექტემბერი"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ოქტომბერი"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ნოემბერი"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "დეკემბერი"
@@ -186,74 +186,74 @@ msgstr "ბოლო წელს"
msgid "years ago"
msgstr "წლის წინ"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "არჩევა"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "კი"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "არა"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "არჩევა"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "დიახ"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "ახალი ფაილები"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "უარყოფა"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr "გაზიარებული"
msgid "Share"
msgstr "გაზიარება"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "შეცდომა"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "შეცდომა გაზიარების დროს"
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "პაროლით დაცვა"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "პაროლი"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "პაროლით დაცვა"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "პაროლი"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "ლინკის პიროვნების იმეილზე გაგზავნა"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "გაგზავნა"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "მიუთითე ვადის გასვლის დრო"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "ვადის გასვლის დრო"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "გააზიარე მეილზე"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "მომხმარებელი არ არის ნაპოვნი"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "ჯგუფი"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "გაზიარდა {item}–ში {user}–ის მიერ"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "გაუზიარებადი"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "შეგიძლია შეცვლა"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "დაშვების კონტროლი"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "შექმნა"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "განახლება"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "წაშლა"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "გაზიარება"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "პაროლით დაცული"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "შეცდომა ვადის გასვლის მითითების დროს"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "გაგზავნა ...."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "იმეილი გაიგზავნა"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "გაფრთხილება"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 4041ae62e9..cb00f174d7 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr "დაუშვი აპლიკაციების უფლებ
msgid "Allow links"
msgstr "ლინკების დაშვება"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "გადაზიარების დაშვება"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის გაზიარებული"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "გადაზიარების დაშვება"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის გაზიარებული"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/km/core.po b/l10n/km/core.po
index 0bd6c1bc9d..0c9b1bf6c7 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 14:00+0000\n"
-"Last-Translator: សុវិចិត្រ Sovichet ទេព Tep\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ថ្ងៃអាទិត្យ"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ថ្ងៃចន្ទ"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "ថ្ងៃអង្គារ"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "ថ្ងៃពុធ"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ថ្ងៃព្រហស្បតិ៍"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "ថ្ងៃសុក្រ"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "ថ្ងៃសៅរ៍"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ខែមករា"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ខែកុម្ភៈ"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "ខែមីនា"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ខែមេសា"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "ខែឧសភា"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ខែមិថុនា"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ខែកក្កដា"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ខែសីហា"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ខែកញ្ញា"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ខែតុលា"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ខែវិច្ឆិកា"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ខែធ្នូ"
@@ -187,74 +187,74 @@ msgstr "ឆ្នាំមុន"
msgid "years ago"
msgstr "ឆ្នាំមុន"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ជ្រើស"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ព្រម"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ទេ"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ជ្រើស"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "ព្រម"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "ឯកសារថ្មី"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "មានឯកសារនេះរួចហើយ"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "លើកលែង"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "បន្ត"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(បានជ្រើសទាំងអស់)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "(បានជ្រើស {count})"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -286,12 +286,12 @@ msgstr "បានចែករំលែក"
msgid "Share"
msgstr "ចែករំលែក"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "កំហុស"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "កំហុសពេលចែករំលែក"
@@ -319,107 +319,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "ការពារដោយពាក្យសម្ងាត់"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "ពាក្យសម្ងាត់"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "អនុញ្ញាតការផ្ទុកឡើងជាសាធារណៈ"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "ផ្ញើ"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "កំណត់ពេលផុតកំណត់"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "ពេលផុតកំណត់"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "ចែករំលែកតាមអ៊ីមែល៖"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "រកមិនឃើញមនុស្សណាម្នាក់"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "ក្រុម"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "មិនអនុញ្ញាតឲ្យមានការចែករំលែកឡើងវិញ"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "បានចែករំលែកក្នុង {item} ជាមួយ {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "លែងចែករំលែក"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "អាចកែប្រែ"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "សិទ្ធិបញ្ជា"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "បង្កើត"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "ធ្វើបច្ចុប្បន្នភាព"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "លុប"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "ចែករំលែក"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "បានការពារដោយពាក្យសម្ងាត់"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "កំពុងផ្ញើ ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "បានផ្ញើអ៊ីមែល"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "បម្រាម"
diff --git a/l10n/km/settings.po b/l10n/km/settings.po
index ae5ebac02c..e922811829 100644
--- a/l10n/km/settings.po
+++ b/l10n/km/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -191,7 +191,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "កំពុងផ្ញើ..."
@@ -516,61 +516,52 @@ msgstr "អនុញ្ញាតឲ្យកម្មវិធីប្
msgid "Allow links"
msgstr "អនុញ្ញាតតំណ"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "អនុញ្ញាតឲ្យអ្នកប្រើចែករំលែករបស់ទៅសាធារណៈជាមួយតំណ"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "អនុញ្ញាតការផ្ទុកឡើងជាសាធារណៈ"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "អនុញ្ញាតការចែករំលែកម្ដងទៀត"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "អនុញ្ញាតឲ្យអ្នកប្រើចែករំលែកជាមួយនរណាម្នាក់"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "អនុញ្ញាតឲ្យអ្នកប្រើចែករំលែករបស់ទៅសាធារណៈជាមួយតំណ"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "អនុញ្ញាតការចែករំលែកម្ដងទៀត"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "អនុញ្ញាតឲ្យអ្នកប្រើចែករំលែកជាមួយនរណាម្នាក់"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 77ca23e3f5..288a7f78f2 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -58,202 +58,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 4d74debd3d..2049dc3931 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index b8a8e3882d..49cf27a40b 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -65,79 +65,79 @@ msgstr "사용 가능한 프로필 사진이 없습니다. 다시 시도하십
msgid "No crop data provided"
msgstr "선택된 데이터가 없습니다."
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "일요일"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "월요일"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "화요일"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "수요일"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "목요일"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "금요일"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "토요일"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "1월"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "2월"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "3월"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "4월"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "5월"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "6월"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "7월"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "8월"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "9월"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "10월"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "11월"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "12월"
@@ -193,74 +193,74 @@ msgstr "작년"
msgid "years ago"
msgstr "년 전"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "선택"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "파일 선택 템플릿을 불러오는 중 오류 발생: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "예"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "아니요"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "선택"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "파일 선택 템플릿을 불러오는 중 오류 발생: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "확인"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "메시지 템플릿을 불러오는 중 오류 발생: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "파일 {count}개 충돌"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "파일 1개 충돌"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "어느 파일을 유지하시겠습니까?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "두 버전을 모두 선택하면, 파일 이름에 번호가 추가될 것입니다."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "취소"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "계속"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(모두 선택됨)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count}개 선택됨)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "파일 존재함 템플릿을 불러오는 중 오류 발생"
@@ -292,12 +292,12 @@ msgstr "공유됨"
msgid "Share"
msgstr "공유"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "오류"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "공유하는 중 오류 발생"
@@ -325,107 +325,116 @@ msgstr "사용자 및 그룹과 공유..."
msgid "Share link"
msgstr "링크 공유"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "암호 보호"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "암호"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "공개 업로드 허용"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "이메일 주소"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "전송"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "만료 날짜 설정"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "만료 날짜"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "이메일로 공유:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "발견된 사람 없음"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "그룹"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "다시 공유할 수 없습니다"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "{user} 님과 {item}에서 공유 중"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "공유 해제"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "이메일로 알림"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "편집 가능"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "접근 제어"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "생성"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "업데이트"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "삭제"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "공유"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "암호로 보호됨"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "만료 날짜 해제 오류"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "만료 날짜 설정 오류"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "전송 중..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "이메일 발송됨"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "경고"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 49cd5ae7c0..d79a15e4e1 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -194,7 +194,7 @@ msgstr "백엔드에서 암호 변경을 지원하지 않지만, 사용자의
msgid "Unable to change password"
msgstr "암호를 변경할 수 없음"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "보내는 중..."
@@ -519,61 +519,52 @@ msgstr "앱에서 공유 API를 사용할 수 있도록 허용"
msgid "Allow links"
msgstr "링크 허용"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "공개 업로드 허용"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "다른 사용자들이 공개된 공유 폴더에 파일 업로드 허용"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "재공유 허용"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "누구나와 공유할 수 있도록 허용"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "사용자가 속해 있는 그룹의 사용자에게만 공유할 수 있도록 허용"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "메일 알림 허용"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "재공유 허용"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "누구나와 공유할 수 있도록 허용"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "사용자가 속해 있는 그룹의 사용자에게만 공유할 수 있도록 허용"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "메일 알림 허용"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 8b5c5762c8..4c10ddade9 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -190,75 +190,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "بەڵێ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "نەخێر"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "لابردن"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr "هاوبەشی کردن"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "ههڵه"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "وشەی تێپەربو"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "وشەی تێپەربو"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "ئاگاداری"
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 7b95bc5325..8c63bb0949 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 61ad5ec9c7..e060fad766 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonndeg"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Méindeg"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dënschdeg"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mëttwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donneschdeg"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freideg"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samschdeg"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mäerz"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abrëll"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mee"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
@@ -192,75 +192,75 @@ msgstr "Lescht Joer"
msgid "years ago"
msgstr "Joren hir"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswielen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Jo"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswielen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Weieng Fichieren wëlls de gär behalen?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Ofbriechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Weider"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(all ausgewielt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} ausgewielt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,12 +292,12 @@ msgstr "Gedeelt"
msgid "Share"
msgstr "Deelen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Feeler"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Feeler beim Deelen"
@@ -325,107 +325,116 @@ msgstr ""
msgid "Share link"
msgstr "Link deelen"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Passwuertgeschützt"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Passwuert"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Ëffentlechen Upload erlaaben"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Link enger Persoun mailen"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Schécken"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Verfallsdatum setzen"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Verfallsdatum"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Via E-Mail deelen:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Keng Persoune fonnt"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "Grupp"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Weiderdeelen ass net erlaabt"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Gedeelt an {item} mat {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Net méi deelen"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "via e-mail Bescheed ginn"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kann änneren"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "Zougrëffskontroll"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "erstellen"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "aktualiséieren"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "läschen"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "deelen"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Passwuertgeschützt"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Feeler beim Läsche vum Verfallsdatum"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Feeler beim Setze vum Verfallsdatum"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Gëtt geschéckt..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email geschéckt"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Warnung"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 0a5221ae1e..6e3a01fd93 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr "Erlab Apps d'Share API ze benotzen"
msgid "Allow links"
msgstr "Links erlaben"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Resharing erlaben"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Useren erlaben mat egal wiem ze sharen"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Resharing erlaben"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Useren erlaben mat egal wiem ze sharen"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 35124645f0..93ef807cfd 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -63,79 +63,79 @@ msgstr "Nėra laikino profilio paveikslėlio, bandykite dar kartą"
msgid "No crop data provided"
msgstr "Nenurodyti apkirpimo duomenys"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sekmadienis"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pirmadienis"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Antradienis"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Trečiadienis"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Ketvirtadienis"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Penktadienis"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Šeštadienis"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Sausis"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Vasaris"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Kovas"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Balandis"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Gegužė"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Birželis"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Liepa"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Rugpjūtis"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Rugsėjis"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Spalis"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Lapkritis"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Gruodis"
@@ -199,76 +199,76 @@ msgstr "praeitais metais"
msgid "years ago"
msgstr "prieš metus"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Pasirinkite"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Taip"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Pasirinkite"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Gerai"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Klaida įkeliant žinutės ruošinį: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} failas konfliktuoja"
msgstr[1] "{count} failai konfliktuoja"
msgstr[2] "{count} failų konfliktų"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Vienas failo konfliktas"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Kuriuos failus norite laikyti?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Atšaukti"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Tęsti"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(visi pažymėti)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} pažymėtų)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Klaida įkeliant esančių failų ruošinį"
@@ -300,12 +300,12 @@ msgstr "Dalinamasi"
msgid "Share"
msgstr "Dalintis"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Klaida"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Klaida, dalijimosi metu"
@@ -333,107 +333,116 @@ msgstr "Dalintis su vartotoju arba grupe..."
msgid "Share link"
msgstr "Dalintis nuoroda"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Apsaugotas slaptažodžiu"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Slaptažodis"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Leisti viešą įkėlimą"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Nusiųsti nuorodą paštu"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Siųsti"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Nustatykite galiojimo laiką"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Galiojimo laikas"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Dalintis per el. paštą:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Žmonių nerasta"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupė"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Dalijinasis išnaujo negalimas"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Pasidalino {item} su {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Nebesidalinti"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "pranešti el. paštu"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "gali redaguoti"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "priėjimo kontrolė"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "sukurti"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "atnaujinti"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "ištrinti"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "dalintis"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Apsaugota slaptažodžiu"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Klaida nuimant galiojimo laiką"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Klaida nustatant galiojimo laiką"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Siunčiama..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Laiškas išsiųstas"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Įspėjimas"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index f6b1c5492d..80216167f4 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -194,7 +194,7 @@ msgstr "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo rakta
msgid "Unable to change password"
msgstr "Nepavyksta pakeisti slaptažodžio"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -519,61 +519,52 @@ msgstr "Leidžia programoms naudoti Share API"
msgid "Allow links"
msgstr "Lesti nuorodas"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Leisti viešus įkėlimus"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Leisti dalintis"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Leisti naudotojams toliau dalintis elementais pasidalintais su jais"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Leisti naudotojams dalintis su bet kuo"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Leisti naudotojams dalintis tik su naudotojais savo grupėje"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Leisti el. pašto perspėjimą"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Leisti dalintis"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Leisti naudotojams toliau dalintis elementais pasidalintais su jais"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Leisti naudotojams dalintis su bet kuo"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Leisti naudotojams dalintis tik su naudotojais savo grupėje"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Leisti el. pašto perspėjimą"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 269ea92133..4fc3f187a3 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Svētdiena"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pirmdiena"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Otrdiena"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Trešdiena"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Ceturtdiena"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Piektdiena"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sestdiena"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Janvāris"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februāris"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marts"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprīlis"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maijs"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Jūnijs"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Jūlijs"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Augusts"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembris"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktobris"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembris"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembris"
@@ -195,76 +195,76 @@ msgstr "gājušajā gadā"
msgid "years ago"
msgstr "gadus atpakaļ"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izvēlieties"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Jā"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nē"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izvēlieties"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Labi"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Jaunās datnes"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Atcelt"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -296,12 +296,12 @@ msgstr "Kopīgs"
msgid "Share"
msgstr "Dalīties"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Kļūda"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Kļūda, daloties"
@@ -329,107 +329,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Aizsargāt ar paroli"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Parole"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Ļaut publisko augšupielādi."
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Sūtīt saiti personai pa e-pastu"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Sūtīt"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Iestaties termiņa datumu"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Termiņa datums"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Dalīties, izmantojot e-pastu:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Nav atrastu cilvēku"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupa"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Atkārtota dalīšanās nav atļauta"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Dalījās ar {item} ar {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Pārtraukt dalīšanos"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "var rediģēt"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "piekļuves vadība"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "izveidot"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "atjaunināt"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "dzēst"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "dalīties"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Aizsargāts ar paroli"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Kļūda, noņemot termiņa datumu"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Kļūda, iestatot termiņa datumu"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sūta..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Vēstule nosūtīta"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Brīdinājums"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 2d4e7f783c..49cd66250c 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr "Ļauj lietotnēm izmantot koplietošanas API"
msgid "Allow links"
msgstr "Atļaut saites"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Atļaut publisko augšupielādi"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Ļaut lietotājiem iespējot atļaut citiem augšupielādēt failus viņu publiskajās mapēs"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Atļaut atkārtotu koplietošanu"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Ļaut lietotājiem dalīties ar vienumiem atkārtoti"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Ļaut lietotājiem dalīties ar visiem"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Ļaut lietotājiem dalīties ar lietotājiem to grupās"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Atļaut atkārtotu koplietošanu"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Ļaut lietotājiem dalīties ar vienumiem atkārtoti"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Ļaut lietotājiem dalīties ar visiem"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Ļaut lietotājiem dalīties ar lietotājiem to grupās"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index ac2a4863d3..bd6c36b3b4 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Недела"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понеделник"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Вторник"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Среда"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четврток"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Петок"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Сабота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Јануари"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Февруари"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Март"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Април"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Мај"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Јуни"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Јули"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Август"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Септември"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Октомври"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Ноември"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Декември"
@@ -191,75 +191,75 @@ msgstr "минатата година"
msgid "years ago"
msgstr "пред години"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Избери"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Избери"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Во ред"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Конфликт со една датотека"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Продолжи"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(сите одбрани)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} одбраните)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Грешка при вчитување на датотеката, шаблонот постои "
@@ -291,12 +291,12 @@ msgstr "Споделен"
msgid "Share"
msgstr "Сподели"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Грешка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Грешка при споделување"
@@ -324,107 +324,116 @@ msgstr ""
msgid "Share link"
msgstr "Сподели ја врската"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Заштити со лозинка"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Лозинка"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Дозволи јавен аплоуд"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Прати врска по е-пошта на личност"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Прати"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Постави рок на траење"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Рок на траење"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Сподели по е-пошта:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Не се најдени луѓе"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "група"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Повторно споделување не е дозволено"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Споделено во {item} со {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Не споделувај"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "извести преку електронска пошта"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "може да се измени"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "контрола на пристап"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "креирај"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "ажурирај"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "избриши"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "сподели"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Заштитено со лозинка"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Грешка при тргање на рокот на траење"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Грешка при поставување на рок на траење"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Праќање..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Е-порака пратена"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Предупредување"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index b8ed6cc23e..b5953b4007 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr "Вашата лозинка неможе да се смени"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr "Дозволете апликациите да го користат API
msgid "Allow links"
msgstr "Дозволи врски"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Дозволи јавен аплоуд"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Овозможи повторно споделување"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Овозможи корисниците да споделуваат со секого"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Овозможи корисниците да споделуваат со корисници од своите групи"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Овозможи известување по електронска пошта"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Овозможи повторно споделување"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Овозможи корисниците да споделуваат со секого"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Овозможи корисниците да споделуваат со корисници од своите групи"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Овозможи известување по електронска пошта"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ml/core.po b/l10n/ml/core.po
index bc9734a075..36ed6843a7 100644
--- a/l10n/ml/core.po
+++ b/l10n/ml/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/ml/settings.po b/l10n/ml/settings.po
index 44fbe3297c..916cde608e 100644
--- a/l10n/ml/settings.po
+++ b/l10n/ml/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index bb6ef01bf7..43072fac0e 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index b58d48f248..abcb0f68ec 100644
--- a/l10n/ml_IN/settings.po
+++ b/l10n/ml_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/mn/core.po b/l10n/mn/core.po
index c2ebf09969..b12f653953 100644
--- a/l10n/mn/core.po
+++ b/l10n/mn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/mn/settings.po b/l10n/mn/settings.po
index 42583be4d3..c54536c833 100644
--- a/l10n/mn/settings.po
+++ b/l10n/mn/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 8557c2acf1..d445ebeb30 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Ahad"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Isnin"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Selasa"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Rabu"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Khamis"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Jumaat"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sabtu"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januari"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februari"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mac"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mei"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Jun"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julai"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Ogos"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Disember"
@@ -186,74 +186,74 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr ""
msgid "Share"
msgstr "Kongsi"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Ralat"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Kata laluan"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Kata laluan"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Amaran"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 177b5c92c0..24851e9ac8 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index fb60c87ff1..a6fc3caa2a 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ဇန်နဝါရီ"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ဖေဖော်ဝါရီ"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "မတ်"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ဧပြီ"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "မေ"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ဇွန်"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ဇူလိုင်"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ဩဂုတ်"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "စက်တင်ဘာ"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "အောက်တိုဘာ"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "နိုဝင်ဘာ"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ဒီဇင်ဘာ"
@@ -186,74 +186,74 @@ msgstr "မနှစ်က"
msgid "years ago"
msgstr "နှစ် အရင်က"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ရွေးချယ်"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ဟုတ်"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "မဟုတ်ဘူး"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ရွေးချယ်"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "အိုကေ"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ပယ်ဖျက်မည်"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "စကားဝှက်"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "ပြင်ဆင်နိုင်"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "ဖန်တီးမည်"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "ဖျက်မည်"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "ဝေမျှမည်"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 0687b5c027..6de1e2d537 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 60be9f1a05..d81a175aab 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -62,79 +62,79 @@ msgstr "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen"
msgid "No crop data provided"
msgstr "Ingen beskjæringsinformasjon angitt"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Søndag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Mandag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tirsdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Onsdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Torsdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Fredag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Lørdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
@@ -194,75 +194,75 @@ msgstr "i fjor"
msgid "years ago"
msgstr "år siden"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Velg"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Feil ved lasting av filvelger-mal: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Velg"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Feil ved lasting av filvelger-mal: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Feil ved lasting av meldingsmal: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonflikter"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "En filkonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Hvilke filer vil du beholde?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Fortsett"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(alle valgt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valgt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Feil ved lasting av \"filen eksisterer\"-mal"
@@ -294,12 +294,12 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Feil"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Feil under deling"
@@ -327,107 +327,116 @@ msgstr "Del med bruker eller gruppe …"
msgid "Share link"
msgstr "Del lenke"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Passordbeskyttet"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Passord"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Tillat Offentlig Opplasting"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Email lenke til person"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Send"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Set utløpsdato"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Del på epost"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Ingen personer funnet"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "gruppe"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Videredeling er ikke tillatt"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Avslutt deling"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "Varsle på email"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kan endre"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "opprett"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "oppdater"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "slett"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "del"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Passordbeskyttet"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Feil ved nullstilling av utløpsdato"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Kan ikke sette utløpsdato"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sender..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-post sendt"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Advarsel"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index f237d066e1..6c0eca0819 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -193,7 +193,7 @@ msgstr "Serveren støtter ikke endring av passord, men oppdatering av brukerens
msgid "Unable to change password"
msgstr "Kunne ikke endre passord"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Sender..."
@@ -518,61 +518,52 @@ msgstr "Tillat apps å bruke API for Deling"
msgid "Allow links"
msgstr "Tillat lenker"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Tillat brukere å dele filer offentlig med lenker"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Tillat offentlig opplasting"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Tillat at brukere lar andre laste opp til deres offentlig delte mapper"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "TIllat videredeling"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Tillat brukere å dele med alle"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Tillat kun deling med andre brukere i samme gruppe"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Tillat påminnelser i e-post"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Tillat brukere å dele filer offentlig med lenker"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "TIllat videredeling"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Tillat brukere å dele med alle"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Tillat kun deling med andre brukere i samme gruppe"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Tillat påminnelser i e-post"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index 9ce7cea032..a7545a0db0 100644
--- a/l10n/nds/core.po
+++ b/l10n/nds/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/nds/settings.po b/l10n/nds/settings.po
index 10ee5ff582..476be1d5ec 100644
--- a/l10n/nds/settings.po
+++ b/l10n/nds/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index eccb815609..b2e67d4d66 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 34e7295ff7..391451bf7c 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index ff7a56a481..b4984a1a1d 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 19:10+0000\n"
-"Last-Translator: kwillems \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -61,79 +61,79 @@ msgstr "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw"
msgid "No crop data provided"
msgstr "Geen bijsnijdingsgegevens opgegeven"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "zondag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "maandag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "dinsdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "woensdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "donderdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "vrijdag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "zaterdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "januari"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "februari"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "maart"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "april"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "mei"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "augustus"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "september"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "november"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "december"
@@ -193,75 +193,75 @@ msgstr "vorig jaar"
msgid "years ago"
msgstr "jaar geleden"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Kies"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fout bij laden bestandenselecteur sjabloon: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Kies"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fout bij laden bestandenselecteur sjabloon: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fout bij laden berichtensjabloon: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} bestandsconflict"
msgstr[1] "{count} bestandsconflicten"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Een bestandsconflict"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nieuwe bestanden"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Al aanwezige bestanden"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Welke bestanden wilt u bewaren?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annuleer"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Verder"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(alles geselecteerd)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} geselecteerd)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fout bij laden bestand bestaat al sjabloon"
@@ -293,12 +293,12 @@ msgstr "Gedeeld"
msgid "Share"
msgstr "Delen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Fout"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Fout tijdens het delen"
@@ -326,107 +326,116 @@ msgstr "Delen met gebruiker of groep ..."
msgid "Share link"
msgstr "Deel link"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Wachtwoord"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Sta publieke uploads toe"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "E-mail link naar persoon"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Versturen"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Stel vervaldatum in"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Vervaldatum"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Deel via e-mail:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Geen mensen gevonden"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "groep"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Verder delen is niet toegestaan"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Gedeeld in {item} met {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Stop met delen"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "melden per e-mail"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kan wijzigen"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "toegangscontrole"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "creëer"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "bijwerken"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "verwijderen"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "deel"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Fout tijdens het verwijderen van de vervaldatum"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Fout tijdens het instellen van de vervaldatum"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Versturen ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-mail verzonden"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Waarschuwing"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index fa483d9f6b..bc91b78cfa 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -104,7 +104,7 @@ msgstr "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Cryptosleutels permanent verwijderd"
#: ajax/deletekeys.php:16
msgid ""
@@ -130,7 +130,7 @@ msgstr "Niet in staat om gebruiker te verwijderen"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Backup succesvol terggezet"
#: ajax/restorekeys.php:23
msgid ""
@@ -193,7 +193,7 @@ msgstr "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleute
msgid "Unable to change password"
msgstr "Kan wachtwoord niet wijzigen"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Versturen..."
@@ -279,11 +279,11 @@ msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even du
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Verwijder cryptosleutels permanent."
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Herstel cryptosleutels."
#: js/users.js:47
msgid "deleted"
@@ -518,62 +518,53 @@ msgstr "Apps toestaan de Share API te gebruiken"
msgid "Allow links"
msgstr "Toestaan links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Sta publieke uploads toe"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Toestaan opnieuw delen"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Toestaan dat gebruikers met iedereen delen"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Toestaan e-mailnotificaties"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Sta gebruikers toe om e-mailnotificaties te versturen voor gedeelde bestanden"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Stel standaard vervaldatum in"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Vervalt na"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "dagen"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Verplicht de vervaldatum"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Toestaan opnieuw delen"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Toestaan dat gebruikers met iedereen delen"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Toestaan e-mailnotificaties"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Laat shares standaard vervallen na N dagen"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Sta gebruikers toe om e-mailnotificaties te versturen voor gedeelde bestanden"
#: templates/admin.php:278
msgid "Security"
@@ -844,11 +835,11 @@ msgstr ""
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Herstel cryptosleutels"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Verwijder cryptosleutels"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index a29ddf9b45..0293e14af8 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: brekkjen \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -62,79 +62,79 @@ msgstr "Inga midlertidig profilbilete tilgjengeleg, prøv igjen"
msgid "No crop data provided"
msgstr "Ingen beskjeringsdata gitt"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Søndag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Måndag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tysdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Onsdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Torsdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Fredag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Laurdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
@@ -194,75 +194,75 @@ msgstr "i fjor"
msgid "years ago"
msgstr "år sidan"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vel"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Klarte ikkje å lasta filplukkarmal: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vel"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Klarte ikkje å lasta filplukkarmal: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Greitt"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Klarte ikkje å lasta meldingsmal: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonfliktar"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Éin filkonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Kva filer vil du spara?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Gå vidare"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(alle valte)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valte)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Klarte ikkje å lasta fil-finst-mal"
@@ -294,12 +294,12 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Feil"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Feil ved deling"
@@ -327,107 +327,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Passordvern"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Passord"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Tillat offentleg opplasting"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Send lenkja over e-post"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Send"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Set utløpsdato"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Del over e-post:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Fann ingen personar"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "gruppe"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Vidaredeling er ikkje tillate"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {brukar}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Udel"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kan endra"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "lag"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "oppdater"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "slett"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "del"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Passordverna"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Klarte ikkje fjerna utløpsdato"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Klarte ikkje setja utløpsdato"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Sender …"
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-post sendt"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Åtvaring"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 730f8b73e3..792b72f620 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -192,7 +192,7 @@ msgstr "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til b
msgid "Unable to change password"
msgstr "Klarte ikkje å endra passordet"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -517,61 +517,52 @@ msgstr "La app-ar bruka API-et til deling"
msgid "Allow links"
msgstr "Tillat lenkjer"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "La brukarar dela ting offentleg med lenkjer"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Tillat offentlege opplastingar"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "La brukarar tillata andre å lasta opp i deira offentleg delte mapper"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Tillat vidaredeling"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "La brukarar vidaredela delte ting"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "La brukarar dela med kven som helst"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "La brukarar dela berre med brukarar i deira grupper"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "La brukarar dela ting offentleg med lenkjer"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Tillat vidaredeling"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "La brukarar vidaredela delte ting"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "La brukarar dela med kven som helst"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "La brukarar dela berre med brukarar i deira grupper"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 654b95dd28..31e339b00d 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -58,202 +58,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po
index de9c862049..9e9552464f 100644
--- a/l10n/nqo/settings.po
+++ b/l10n/nqo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 60b1fbec3d..f023554872 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Dimenge"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Diluns"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dimarç"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Dimecres"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Dijòus"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Divendres"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Dissabte"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "genièr"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "febrièr"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "març"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "junh"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "julhet"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "agost"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "septembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "octobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembre"
@@ -190,75 +190,75 @@ msgstr "an passat"
msgid "years ago"
msgstr "ans a"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Causís"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Òc"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Causís"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "D'accòrdi"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annula"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr "Parteja"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Error al partejar"
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "Parat per senhal"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Senhal"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "Parat per senhal"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Senhal"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Met la data d'expiracion"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data d'expiracion"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Parteja tras corrièl :"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Deguns trobat"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grop"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Tornar partejar es pas permis"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Pas partejador"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "pòt modificar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "Contraròtle d'acces"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "crea"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "met a jorn"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "escafa"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "parteja"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Parat per senhal"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Error al metre de la data d'expiracion"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 7d6fc040cc..49749a5166 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/or_IN/core.po b/l10n/or_IN/core.po
index fedef0897a..46ba5d6247 100644
--- a/l10n/or_IN/core.po
+++ b/l10n/or_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/or_IN/settings.po b/l10n/or_IN/settings.po
index 4daa5cf369..a273f979ce 100644
--- a/l10n/or_IN/settings.po
+++ b/l10n/or_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index 29fbeb5721..575ea81af0 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ਐਤਵਾਰ"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ਸੋਮਵਾਰ"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "ਮੰਗਲਵਾਰ"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "ਬੁੱਧਵਾਰ"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ਵੀਰਵਾਰ"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "ਸ਼ੁੱਕਰਵਾਰ"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ਜਨਵਰੀ"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ਫਰਵਰੀ"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "ਮਾਰਚ"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ਅਪਰੈ"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "ਮਈ"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ਜੂਨ"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ਜੁਲਾਈ"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ਅਗਸਤ"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ਸਤੰਬ"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ਅਕਤੂਬਰ"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ਨਵੰਬ"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ਦਸੰਬਰ"
@@ -191,75 +191,75 @@ msgstr "ਪਿਛਲੇ ਸਾਲ"
msgid "years ago"
msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ਚੁਣੋ"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ਹਾਂ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ਨਹੀਂ"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ਚੁਣੋ"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "ਠੀਕ ਹੈ"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,12 +291,12 @@ msgstr ""
msgid "Share"
msgstr "ਸਾਂਝਾ ਕਰੋ"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "ਗਲ"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -324,107 +324,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "ਪਾਸਵਰ"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "ਪਾਸਵਰ"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "ਭੇਜੋ"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po
index 8010357385..6791dbe413 100644
--- a/l10n/pa/settings.po
+++ b/l10n/pa/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 892d91630e..fe77309708 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -62,79 +62,79 @@ msgstr "Brak obrazka profilu tymczasowego, spróbuj ponownie"
msgid "No crop data provided"
msgstr "Brak danych do przycięcia"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Niedziela"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Poniedziałek"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Wtorek"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Środa"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Czwartek"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Piątek"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Styczeń"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Luty"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzec"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Kwiecień"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Czerwiec"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Lipiec"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Sierpień"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Wrzesień"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Październik"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Listopad"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Grudzień"
@@ -198,76 +198,76 @@ msgstr "w zeszłym roku"
msgid "years ago"
msgstr "lat temu"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Wybierz"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Błąd podczas ładowania pliku wybranego szablonu: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Tak"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Wybierz"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Błąd podczas ładowania pliku wybranego szablonu: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Błąd podczas ładowania szablonu wiadomości: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} konfliktów plików"
msgstr[1] "{count} konfliktów plików"
msgstr[2] "{count} konfliktów plików"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Konflikt pliku"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nowe pliki"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Już istniejące pliki"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Które pliki chcesz zachować?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Anuluj"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Kontynuuj "
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(wszystkie zaznaczone)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} zaznaczonych)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Błąd podczas ładowania szablonu istniejącego pliku"
@@ -299,12 +299,12 @@ msgstr "Udostępniono"
msgid "Share"
msgstr "Udostępnij"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Błąd"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Błąd podczas współdzielenia"
@@ -332,107 +332,116 @@ msgstr "Współdziel z użytkownikiem lub grupą ..."
msgid "Share link"
msgstr "Udostępnij link"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Zabezpiecz hasłem"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Hasło"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Pozwól na publiczne wczytywanie"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Wyślij osobie odnośnik poprzez e-mail"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Wyślij"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Ustaw datę wygaśnięcia"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data wygaśnięcia"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Współdziel poprzez e-mail:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Nie znaleziono ludzi"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupa"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Współdzielenie nie jest możliwe"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Współdzielone w {item} z {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Zatrzymaj współdzielenie"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "powiadom przez emaila"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "może edytować"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "kontrola dostępu"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "utwórz"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "uaktualnij"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "usuń"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "współdziel"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Zabezpieczone hasłem"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Błąd podczas usuwania daty wygaśnięcia"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Błąd podczas ustawiania daty wygaśnięcia"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Wysyłanie..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-mail wysłany"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Ostrzeżenie"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 1a022185f4..7125223162 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -103,13 +103,13 @@ msgstr "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbu
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Klucze szyfrujące zostały trwale usunięte"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -129,13 +129,13 @@ msgstr "Nie można usunąć użytkownika"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Archiwum zostało prawidłowo przywrócone"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -192,7 +192,7 @@ msgstr "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownik
msgid "Unable to change password"
msgstr "Nie można zmienić hasła"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Wysyłam..."
@@ -278,11 +278,11 @@ msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas."
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Usuń trwale klucze szyfrujące."
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Przywróć klucze szyfrujące."
#: js/users.js:47
msgid "deleted"
@@ -517,62 +517,53 @@ msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
msgid "Allow links"
msgstr "Zezwalaj na odnośniki"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Pozwól na publiczne wczytywanie"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Zezwalaj na ponowne udostępnianie"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Pozwól na mailowe powiadomienia"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Ustaw domyślną datę wygaśnięcia"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Wygaś po"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "dniach"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Wymuś datę wygaśnięcia"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Zezwalaj na ponowne udostępnianie"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Pozwól na mailowe powiadomienia"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Wygaś udziały domyślnie po N dniach"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików"
#: templates/admin.php:278
msgid "Security"
@@ -839,15 +830,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane."
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Przywróć klucze szyfrujące"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Usuń klucze szyfrujące"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index b276462614..3f5031196d 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr "Sem imagem no perfil temporário disponível, tente novamente"
msgid "No crop data provided"
msgstr "Nenhum dado para coleta foi fornecido"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Segunda-feira"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Terça-feira"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Quarta-feira"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Quinta-feira"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Sexta-feira"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "janeiro"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "fevereiro"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "março"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "maio"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "junho"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "julho"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "setembro"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "outubro"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "novembro"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "dezembro"
@@ -192,75 +192,75 @@ msgstr "último ano"
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escolha"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Erro no seletor de carregamento modelo de arquivos: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escolha"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Erro no seletor de carregamento modelo de arquivos: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Erro no carregamento de modelo de mensagem: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflito de arquivo"
msgstr[1] "{count} conflitos de arquivos"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Conflito em um arquivo"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Novos Arquivos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Arquivos já existentes"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Qual arquivo você quer manter?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todos os selecionados)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} selecionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Erro ao carregar arquivo existe modelo"
@@ -292,12 +292,12 @@ msgstr "Compartilhados"
msgid "Share"
msgstr "Compartilhar"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Erro"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Erro ao compartilhar"
@@ -325,107 +325,116 @@ msgstr "Compartilhar com usuário ou grupo ..."
msgid "Share link"
msgstr "Compartilher link"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Proteger com senha"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Senha"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Permitir upload público"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Enviar link por e-mail"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Definir data de expiração"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Compartilhar via e-mail:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Nenhuma pessoa encontrada"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Não é permitido re-compartilhar"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Compartilhado em {item} com {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Descompartilhar"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "notificar por e-mail"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "controle de acesso"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "criar"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "atualizar"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "remover"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "compartilhar"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protegido com senha"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Erro ao remover data de expiração"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Erro ao definir data de expiração"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Enviando ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-mail enviado"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Aviso"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 8e84befbc0..d67e1e0ea4 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -103,13 +103,13 @@ msgstr "Não foi possível descriptografar os arquivos, verifique sua senha e te
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Chaves de criptografia excluídas permanentemente"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -129,13 +129,13 @@ msgstr "Não foi possível remover usuário"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Backup restaurado com sucesso"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -192,7 +192,7 @@ msgstr "Back-end não suporta alteração de senha, mas a chave de criptografia
msgid "Unable to change password"
msgstr "Impossível modificar senha"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Enviando..."
@@ -278,11 +278,11 @@ msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo."
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Eliminar chaves de criptografia permanentemente."
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Restaurar chaves de criptografia."
#: js/users.js:47
msgid "deleted"
@@ -517,62 +517,53 @@ msgstr "Permitir que aplicativos usem a API de Compartilhamento"
msgid "Allow links"
msgstr "Permitir links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir que usuários compartilhem itens com o público usando links"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Permitir envio público"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permitir recompartilhamento"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir que usuários compartilhem com qualquer um"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Permitir que usuários compartilhem somente com usuários em seus grupos"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Permitir notificação por email"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Permitir aos usuários enviar notificação de email para arquivos compartilhados"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Configurar a data de expiração"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Expirar depois de"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "dias"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Fazer cumprir a data de expiração"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir que usuários compartilhem itens com o público usando links"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Permitir recompartilhamento"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Permitir que usuários compartilhem com qualquer um"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Permitir que usuários compartilhem somente com usuários em seus grupos"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Permitir notificação por email"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Expirar compartilhamentos automaticamente depois de N dias"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permitir aos usuários enviar notificação de email para arquivos compartilhados"
#: templates/admin.php:278
msgid "Security"
@@ -839,15 +830,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que todos os arquivos forão descriptografados corretamente."
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Restaurar Chaves de Criptografia"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Eliminar Chaves de Criptografia"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index df2a4ff946..453e76c422 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: Helder Meneses \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -66,79 +66,79 @@ msgstr "Foto temporária de perfil indisponível, tente novamente"
msgid "No crop data provided"
msgstr "Sem dados de corte fornecidos"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Segunda"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Terça"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Quarta"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Quinta"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Sexta"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Janeiro"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Fevereiro"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Março"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maio"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junho"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julho"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Setembro"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Outubro"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembro"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezembro"
@@ -198,75 +198,75 @@ msgstr "ano passado"
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escolha"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Erro ao carregar o modelo de selecionador de ficheiro: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escolha"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Erro ao carregar o modelo de selecionador de ficheiro: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Erro ao carregar o template: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de ficheiro"
msgstr[1] "{count} conflitos de ficheiro"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Um conflito no ficheiro"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Ficheiros Novos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Ficheiro já existente"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Quais os ficheiros que pretende manter?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todos seleccionados)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Erro ao carregar o modelo de existências do ficheiro"
@@ -298,12 +298,12 @@ msgstr "Partilhado"
msgid "Share"
msgstr "Partilhar"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Erro"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Erro ao partilhar"
@@ -331,107 +331,116 @@ msgstr "Partilhar com utilizador ou grupo..."
msgid "Share link"
msgstr "Partilhar o link"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Proteger com palavra-passe"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Password"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Permitir Envios Públicos"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Enviar o link por e-mail"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Especificar data de expiração"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Partilhar via email:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Não foi encontrado ninguém"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Não é permitido partilhar de novo"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Partilhado em {item} com {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Deixar de partilhar"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "Notificar por email"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "Controlo de acesso"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "criar"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "apagar"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "partilhar"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protegido com palavra-passe"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Erro ao retirar a data de expiração"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Erro ao aplicar a data de expiração"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "A Enviar..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-mail enviado"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Aviso"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 47dc787e8a..f15d1e1f50 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -196,7 +196,7 @@ msgstr "Não foi possível alterar a sua palavra-passe, mas a chave de encripta
msgid "Unable to change password"
msgstr "Não foi possível alterar a sua password"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "A enviar..."
@@ -521,61 +521,52 @@ msgstr "Permitir que os utilizadores usem a API de partilha"
msgid "Allow links"
msgstr "Permitir links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Permitir Envios Públicos"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permitir repartilha"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir que os utilizadores partilhem com todos"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Permitir notificação por email"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Expira após"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "dias"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Permitir repartilha"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Permitir que os utilizadores partilhem com todos"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Permitir notificação por email"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 0b46a4f7dd..286751e590 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -62,79 +62,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Duminică"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Luni"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Marți"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miercuri"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Joi"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Vineri"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sâmbătă"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Ianuarie"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februarie"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Martie"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprilie"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Iunie"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Iulie"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembrie"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octombrie"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Noiembrie"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembrie"
@@ -198,76 +198,76 @@ msgstr "ultimul an"
msgid "years ago"
msgstr "ani în urmă"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Alege"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nu"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Alege"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflict de fișier"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Ce fișiere vrei să păstrezi?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Anulare"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuă"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -299,12 +299,12 @@ msgstr "Partajat"
msgid "Share"
msgstr "Partajează"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Eroare"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Eroare la partajare"
@@ -332,107 +332,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Protejare cu parolă"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Parolă"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Permiteţi încărcarea publică."
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Expediază legătura prin poșta electronică"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Expediază"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Specifică data expirării"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data expirării"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Distribuie prin email:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Nici o persoană găsită"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grup"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Repartajarea nu este permisă"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Distribuie in {item} si {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Anulare partajare"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "poate edita"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "control acces"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "creare"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "actualizare"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "ștergere"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "partajare"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Protejare cu parolă"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Eroare la anularea datei de expirare"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Eroare la specificarea datei de expirare"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Se expediază..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Mesajul a fost expediat"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Atenție"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index d5209cd853..50c522d28a 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -192,7 +192,7 @@ msgstr ""
msgid "Unable to change password"
msgstr "Imposibil de schimbat parola"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Se expediază..."
@@ -517,62 +517,53 @@ msgstr "Permite aplicațiilor să folosească API-ul de partajare"
msgid "Allow links"
msgstr "Pemite legături"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Permite încărcări publice"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permite utilizatorilor sa activeze opțiunea de încărcare a fișierelor în dosarele lor publice de către alte persoane"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permite repartajarea"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Permite utilizatorilor să partajeze cu oricine"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Permite notificări prin e-mail"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Permite repartajarea"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Permite utilizatorilor să partajeze cu oricine"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Permite notificări prin e-mail"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 9355938546..b8dcb49636 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -75,79 +75,79 @@ msgstr "Временная картинка профиля недоступна,
msgid "No crop data provided"
msgstr "Не указана информация о кадрировании"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Воскресенье"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понедельник"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Вторник"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Среда"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четверг"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Пятница"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Суббота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Январь"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Февраль"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Март"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Апрель"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Май"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Июнь"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Июль"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Август"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Сентябрь"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Октябрь"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Ноябрь"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Декабрь"
@@ -211,76 +211,76 @@ msgstr "в прошлом году"
msgid "years ago"
msgstr "несколько лет назад"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Выбрать"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Ошибка при загрузке шаблона выбора файлов: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Нет"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Выбрать"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Ошибка при загрузке шаблона выбора файлов: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ок"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Ошибка загрузки шаблона сообщений: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} конфликт в файлах"
msgstr[1] "{count} конфликта в файлах"
msgstr[2] "{count} конфликтов в файлах"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Один конфликт в файлах"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Новые файлы"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Какие файлы вы хотите сохранить?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "При выборе обоих версий, к названию копируемого файла будет добавлена цифра"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Отменить"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Продолжить"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(выбраны все)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} выбрано)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Ошибка при загрузке шаблона существующего файла"
@@ -312,12 +312,12 @@ msgstr "Общие"
msgid "Share"
msgstr "Открыть доступ"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Ошибка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Ошибка при открытии доступа"
@@ -345,107 +345,116 @@ msgstr "Поделиться с пользователем или группой
msgid "Share link"
msgstr "Поделиться ссылкой"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Защитить паролем"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Пароль"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Разрешить открытую загрузку"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Почтовая ссылка на персону"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Отправить"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Установить срок доступа"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Дата окончания"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Поделится через электронную почту:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Ни один человек не найден"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "группа"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Общий доступ не разрешен"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Общий доступ к {item} с {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Закрыть общий доступ"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "уведомить по почте"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "может редактировать"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "контроль доступа"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "создать"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "обновить"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "удалить"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "открыть доступ"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Защищено паролем"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Ошибка при отмене срока доступа"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Ошибка при установке срока доступа"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Отправляется ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Письмо отправлено"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Предупреждение"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 340f491291..814fe4916e 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -206,7 +206,7 @@ msgstr "Используемый механизм не поддерживает
msgid "Unable to change password"
msgstr "Невозможно изменить пароль"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Отправляется ..."
@@ -531,61 +531,52 @@ msgstr "Позволить приложениям использовать API
msgid "Allow links"
msgstr "Разрешить ссылки"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Разрешить открытые загрузки"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Разрешить пользователям позволять другим загружать в их открытые папки"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Разрешить переоткрытие общего доступа"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Разрешить пользователя делать общий доступ любому"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Разрешить уведомление по почте"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Разрешить переоткрытие общего доступа"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Разрешить пользователя делать общий доступ любому"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Разрешить уведомление по почте"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 99822bb92c..fbee0e1d5f 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ඉරිදා"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "සඳුදා"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "අඟහරුවාදා"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "බදාදා"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "බ්රහස්පතින්දා"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "සිකුරාදා"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "සෙනසුරාදා"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ජනවාරි"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "පෙබරවාරි"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "මාර්තු"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "අප්රේල්"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "මැයි"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ජූනි"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ජූලි"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "අගෝස්තු"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "සැප්තැම්බර්"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ඔක්තෝබර"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "නොවැම්බර්"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "දෙසැම්බර්"
@@ -190,75 +190,75 @@ msgstr "පෙර අවුරුද්දේ"
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "තෝරන්න"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ඔව්"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "එපා"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "තෝරන්න"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "හරි"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "එපා"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr "බෙදා හදා ගන්න"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "දෝෂයක්"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "මුර පදයකින් ආරක්ශාකරන්න"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "මුර පදය"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "මුර පදයකින් ආරක්ශාකරන්න"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "මුර පදය"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "කල් ඉකුත් විමේ දිනය"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "විද්යුත් තැපෑල මඟින් බෙදාගන්න: "
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "කණ්ඩායම"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "නොබෙදු"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "සංස්කරණය කළ හැක"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "ප්රවේශ පාලනය"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "සදන්න"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "යාවත්කාලීන කරන්න"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "මකන්න"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "බෙදාහදාගන්න"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "අවවාදය"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index e985bc2416..7e1cca3d57 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr "යොමු සලසන්න"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "යළි යළිත් හුවමාරුවට අවසර දෙමි"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "හුවමාරු කළ හුවමාරුවට අවසර දෙමි"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "යළි යළිත් හුවමාරුවට අවසර දෙමි"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "හුවමාරු කළ හුවමාරුවට අවසර දෙමි"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 8a257ae330..c34c30085e 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Nedeľa"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pondelok"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Utorok"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Streda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Štvrtok"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Piatok"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Január"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Február"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marec"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Apríl"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Máj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Jún"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Júl"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Október"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
@@ -194,76 +194,76 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -295,12 +295,12 @@ msgstr ""
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -328,107 +328,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "skupina"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 69c7a59282..a7e90de512 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 6cb073ce6e..a0831d4fb9 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: mhh \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -60,79 +60,79 @@ msgstr "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu"
msgid "No crop data provided"
msgstr "Dáta pre orezanie neboli zadané"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Nedeľa"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pondelok"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Utorok"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Streda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Štvrtok"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Piatok"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Január"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Február"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marec"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Apríl"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Máj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Jún"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Júl"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Október"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
@@ -196,76 +196,76 @@ msgstr "minulý rok"
msgid "years ago"
msgstr "pred rokmi"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vybrať"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Chyba pri nahrávaní šablóny výberu súborov: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Áno"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vybrať"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Chyba pri nahrávaní šablóny výberu súborov: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Chyba pri nahrávaní šablóny správy: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} konflikt súboru"
msgstr[1] "{count} konflikty súboru"
msgstr[2] "{count} konfliktov súboru"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Jeden konflikt súboru"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nové súbory"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Už existujúce súbory"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Ktoré súbory chcete ponechať?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Pokračovať"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(všetko vybrané)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} vybraných)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Chyba pri nahrávaní šablóny existencie súboru"
@@ -297,12 +297,12 @@ msgstr "Zdieľané"
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Chyba"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Chyba počas zdieľania"
@@ -330,107 +330,116 @@ msgstr "Zdieľať s používateľom alebo skupinou ..."
msgid "Share link"
msgstr "Zdieľať linku"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Chrániť heslom"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Heslo"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Povoliť verejné nahrávanie"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Odoslať odkaz emailom"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Odoslať"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Nastaviť dátum expirácie"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Dátum expirácie"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Zdieľať cez email:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Používateľ nenájdený"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "skupina"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Zdieľanie už zdieľanej položky nie je povolené"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Zdieľané v {item} s {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "informovať emailom"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "môže upraviť"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "prístupové práva"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "vytvoriť"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "aktualizovať"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "vymazať"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "zdieľať"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Chránené heslom"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Chyba pri odstraňovaní dátumu expirácie"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Chyba pri nastavení dátumu expirácie"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Odosielam ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email odoslaný"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Varovanie"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index aa8af7fe80..9cade9c73a 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -191,7 +191,7 @@ msgstr "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používate
msgid "Unable to change password"
msgstr "Zmena hesla sa nepodarila"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Odosielam..."
@@ -516,62 +516,53 @@ msgstr "Povoliť aplikáciám používať API na zdieľanie"
msgid "Allow links"
msgstr "Povoliť odkazy"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Povoliť verejné nahrávanie súborov"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Povoliť používateľom umožniť iným používateľom nahrávať do ich zdieľaného priečinka"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Povoliť zdieľanie ďalej"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Povoliť používateľom ďalej zdieľať zdieľané položky"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Povoliť používateľom zdieľať len s používateľmi v ich skupinách"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Povoliť odosielať upozornenia emailom"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Platnosť"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "dni"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Povoliť zdieľanie ďalej"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Povoliť používateľom ďalej zdieľať zdieľané položky"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Povoliť používateľom zdieľať len s používateľmi v ich skupinách"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Povoliť odosielať upozornenia emailom"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+msgid "Allow users to send mail notification for shared files"
+msgstr "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 684da2d982..9c22560556 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr "Na voljo ni nobene začasne slike za profil. Poskusite znova."
msgid "No crop data provided"
msgstr "Ni podanih podatkov obreza"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "nedelja"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ponedeljek"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "torek"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "sreda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "četrtek"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "petek"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "marec"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "april"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "junij"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "julij"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "avgust"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "september"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "november"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "december"
@@ -200,31 +200,31 @@ msgstr "lansko leto"
msgid "years ago"
msgstr "let nazaj"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izbor"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Napaka nalaganja predloge izbirnika datotek: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izbor"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Napaka nalaganja predloge izbirnika datotek: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "V redu"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Napaka nalaganja predloge sporočil: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} spor datotek"
@@ -232,45 +232,45 @@ msgstr[1] "{count} spora datotek"
msgstr[2] "{count} spori datotek"
msgstr[3] "{count} sporov datotek"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "En spor datotek"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nove datoteke"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Obstoječe datoteke"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Katare datoteke želite ohraniti?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Prekliči"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Nadaljuj"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(vse izbrano)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} izbranih)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Napaka nalaganja predloge obstoječih datotek"
@@ -302,12 +302,12 @@ msgstr "V souporabi"
msgid "Share"
msgstr "Souporaba"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Napaka"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Napaka med souporabo"
@@ -335,107 +335,116 @@ msgstr "Souporaba z uporabnikom ali skupino ..."
msgid "Share link"
msgstr "Povezava za prejem"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Zaščiti z geslom"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Geslo"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Dovoli javno pošiljanje na strežnik"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Posreduj povezavo po elektronski pošti"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Pošlji"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Nastavi datum preteka"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Datum preteka"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Pošlji povezavo do dokumenta preko elektronske pošte:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Ni najdenih uporabnikov"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "skupina"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Nadaljnja souporaba ni dovoljena"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "V souporabi v {item} z uporabnikom {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Prekliči souporabo"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "obvesti po elektronski pošti"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "lahko ureja"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "nadzor dostopa"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "ustvari"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "posodobi"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "izbriše"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "določi souporabo"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Zaščiteno z geslom"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Napaka brisanja datuma preteka"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Napaka nastavljanja datuma preteka"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Pošiljanje ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Elektronska pošta je poslana"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Opozorilo"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 11b2961b24..d1e81f6f56 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -191,7 +191,7 @@ msgstr "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodo
msgid "Unable to change password"
msgstr "Ni mogoče spremeniti gesla"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Poteka pošiljanje ..."
@@ -516,62 +516,53 @@ msgstr "Dovoli programom uporabo vmesnika API souporabe"
msgid "Allow links"
msgstr "Dovoli povezave"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Dovoli javno pošiljanje datotek v oblak"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Dovoli uporabnikom, da omogočijo drugim uporabnikom, pošiljati datoteke v javno mapo."
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Dovoli nadaljnjo souporabo"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Uporabnikom dovoli souporabo s komerkoli"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Dovoli obvestila preko elektronske pošte"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti."
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Dovoli nadaljnjo souporabo"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Uporabnikom dovoli souporabo s komerkoli"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Dovoli obvestila preko elektronske pošte"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+msgid "Allow users to send mail notification for shared files"
+msgstr "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti."
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index e10af3f69b..d4566a0366 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:01+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "E djelë"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "E hënë"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "E martë"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "E mërkurë"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "E enjte"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "E premte"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "E shtunë"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Janar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Shkurt"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Prill"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Qershor"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Korrik"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Gusht"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Shtator"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Tetor"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Nëntor"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dhjetor"
@@ -192,75 +192,75 @@ msgstr "vitin e shkuar"
msgid "years ago"
msgstr "vite më parë"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Zgjidh"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Po"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Jo"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Zgjidh"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Në rregull"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Anulo"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,12 +292,12 @@ msgstr "Ndarë"
msgid "Share"
msgstr "Nda"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Veprim i gabuar"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Veprim i gabuar gjatë ndarjes"
@@ -325,107 +325,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Mbro me kod"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Kodi"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Lejo Ngarkimin Publik"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Dërgo email me lidhjen"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Dërgo"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Cakto datën e përfundimit"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Data e përfundimit"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Nda me email:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Nuk u gjet asnjë person"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grupi"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Rindarja nuk lejohet"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Ndarë në {item} me {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Hiq ndarjen"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "mund të ndryshosh"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "kontrollimi i hyrjeve"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "krijo"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "azhurno"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "elimino"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "nda"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Mbrojtur me kod"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Duke dërguar..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email-i u dërgua"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 483e403c42..03162e977b 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr "Lejoni aplikacionet të përdorin share API"
msgid "Allow links"
msgstr "Lejo lidhjet"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Lejo ngarkimin publik"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Lejo përdoruesit të mundësojnë të tjerët që të ngarkojnë materiale në dosjen e tyre publike"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Lejo ri-ndarjen"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Lejoni përdoruesit të ndjanë dhe ata elementë të ndarë më parë ngë të tjerë"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Lejo përdoruesit të ndajnë me cilindo"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Lejoni përdoruesit të ndajnë vetëm me përdorues të të njëjtit grup"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Lejo ri-ndarjen"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Lejoni përdoruesit të ndjanë dhe ata elementë të ndarë më parë ngë të tjerë"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Lejo përdoruesit të ndajnë me cilindo"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Lejoni përdoruesit të ndajnë vetëm me përdorues të të njëjtit grup"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index ae51327796..af467d4cce 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Недеља"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понедељак"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Уторак"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Среда"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четвртак"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Петак"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Субота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Јануар"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Фебруар"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Март"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Април"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Мај"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Јун"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Јул"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Август"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Септембар"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Октобар"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Новембар"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Децембар"
@@ -194,76 +194,76 @@ msgstr "прошле године"
msgid "years ago"
msgstr "година раније"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Одабери"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Одабери"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "У реду"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -295,12 +295,12 @@ msgstr ""
msgid "Share"
msgstr "Дели"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Грешка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Грешка у дељењу"
@@ -328,107 +328,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "Заштићено лозинком"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Лозинка"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "Заштићено лозинком"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Лозинка"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Пошаљи"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Постави датум истека"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Датум истека"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Подели поштом:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Особе нису пронађене."
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "група"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Поновно дељење није дозвољено"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Подељено унутар {item} са {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Укини дељење"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "може да мења"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "права приступа"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "направи"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "ажурирај"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "обриши"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "подели"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Заштићено лозинком"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Грешка код поништавања датума истека"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Грешка код постављања датума истека"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Шаљем..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Порука је послата"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Упозорење"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index d5ebcbcd96..8c8f319aa3 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr "Дозвољава апликацијама да користе API Shar
msgid "Allow links"
msgstr "Дозволи везе"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Дозволи корисницима да деле ставке с другима путем веза"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Дозволи поновно дељење"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Дозволи корисницима да поновно деле ставке с другима"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Дозволи корисницима да деле са било ким"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Дозволи корисницима да деле само са корисницима у њиховим групама"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Дозволи корисницима да деле ставке с другима путем веза"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Дозволи поновно дељење"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Дозволи корисницима да поновно деле ставке с другима"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Дозволи корисницима да деле са било ким"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Дозволи корисницима да деле само са корисницима у њиховим групама"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index cf95dddc75..610bdf2925 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Nedelja"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Ponedeljak"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Utorak"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Sreda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Četvrtak"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Petak"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Subota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mart"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Jun"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Jul"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Avgust"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembar"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktobar"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembar"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembar"
@@ -196,76 +196,76 @@ msgstr "prošle godine"
msgid "years ago"
msgstr "pre nekoliko godina"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izaberi"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izaberi"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Otkaži"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -297,12 +297,12 @@ msgstr "Deljeno"
msgid "Share"
msgstr "Podeli"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Greška"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Greška pri deljenju"
@@ -330,107 +330,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "Zaštita lozinkom"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lozinka"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "Zaštita lozinkom"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lozinka"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "Pošalji link e-mailom"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Pošalji"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Datum isteka"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Deli putem e-maila"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Nema pronađenih ljudi"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Dalje deljenje nije dozvoljeno"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Deljeno u {item} sa {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Ukljoni deljenje"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "dozvoljene izmene"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "napravi"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "ažuriranje"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "brisanje"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "deljenje"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Zaštćeno lozinkom"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Greška u uklanjanju datuma isteka"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Greška u postavljanju datuma isteka"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Slanje..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email poslat"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 4304815e19..bd5d913275 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/su/core.po b/l10n/su/core.po
index ae84b0e517..3b1bf4daf6 100644
--- a/l10n/su/core.po
+++ b/l10n/su/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -58,202 +58,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/su/settings.po b/l10n/su/settings.po
index e076843db1..fe74877f8c 100644
--- a/l10n/su/settings.po
+++ b/l10n/su/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 461f01649a..9724f23b18 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: enoch85 \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -67,79 +67,79 @@ msgstr "Ingen temporär profilbild finns tillgänglig, försök igen"
msgid "No crop data provided"
msgstr "Ingen beskärdata har angivits"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Söndag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Måndag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tisdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Onsdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Torsdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Fredag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Lördag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januari"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februari"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Augusti"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
@@ -199,75 +199,75 @@ msgstr "förra året"
msgid "years ago"
msgstr "år sedan"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Välj"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fel uppstod för filväljarmall: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Välj"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fel uppstod för filväljarmall: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fel uppstod under inläsningen av meddelandemallen: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonflikter"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "En filkonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nya filer"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Filer som redan existerar"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Vilken fil vill du behålla?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Fortsätt"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(Alla valda)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valda)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fel uppstod filmall existerar"
@@ -299,12 +299,12 @@ msgstr "Delad"
msgid "Share"
msgstr "Dela"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Fel"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Fel vid delning"
@@ -332,107 +332,116 @@ msgstr "Dela med användare eller grupp..."
msgid "Share link"
msgstr "Dela länk"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Lösenordsskydda"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Lösenord"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Tillåt publik uppladdning"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "E-posta länk till person"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Skicka"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Sätt utgångsdatum"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Utgångsdatum"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Dela via e-post:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Hittar inga användare"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "Grupp"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Dela vidare är inte tillåtet"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Delad i {item} med {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Sluta dela"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "informera via e-post"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "kan redigera"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "åtkomstkontroll"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "skapa"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "uppdatera"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "radera"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "dela"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Lösenordsskyddad"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Fel vid borttagning av utgångsdatum"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Fel vid sättning av utgångsdatum"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Skickar ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-post skickat"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Varning"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index a139b7007d..d8894eee5d 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgstr "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteri
msgid "Unable to change password"
msgstr "Kunde inte ändra lösenord"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Skickar..."
@@ -527,62 +527,53 @@ msgstr "Tillåt applikationer att använda delat API"
msgid "Allow links"
msgstr "Tillåt länkar"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Tillåt delning till allmänheten via publika länkar"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Tillåt offentlig uppladdning"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Tillåt användare att aktivera\nTillåt användare att göra det möjligt för andra att ladda upp till sina offentligt delade mappar"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Tillåt vidaredelning"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Tillåt användare att dela vidare filer som delats med dem"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Tillåt delning med alla"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Tillåt bara delning med användare i egna grupper"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Tillåt e-post notifikation"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Tillåt användare att skicka mailnotifieringar för delade filer"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Förfaller efter"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "dagar"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Tillåt delning till allmänheten via publika länkar"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Tillåt vidaredelning"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Tillåt användare att dela vidare filer som delats med dem"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Tillåt delning med alla"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Tillåt bara delning med användare i egna grupper"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Tillåt e-post notifikation"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Låt delningar förfalla som standard efter N dagar"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Tillåt användare att skicka mailnotifieringar för delade filer"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 61d4b11f7e..b42c865441 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 178d0a25d3..a91b57bf7e 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ta_IN/core.po b/l10n/ta_IN/core.po
index 50dd80450e..a30d68ed3f 100644
--- a/l10n/ta_IN/core.po
+++ b/l10n/ta_IN/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -190,75 +190,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/ta_IN/settings.po b/l10n/ta_IN/settings.po
index f6bfb6d656..1137ec98ee 100644
--- a/l10n/ta_IN/settings.po
+++ b/l10n/ta_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index b786fa52ef..19a84a890a 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ஞாயிற்றுக்கிழமை"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "திங்கட்கிழமை"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "செவ்வாய்க்கிழமை"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "புதன்கிழமை"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "வியாழக்கிழமை"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "வெள்ளிக்கிழமை"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "சனிக்கிழமை"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "தை"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "மாசி"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "பங்குனி"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "சித்திரை"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "வைகாசி"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ஆனி"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ஆடி"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ஆவணி"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "புரட்டாசி"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ஐப்பசி"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "கார்த்திகை"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "மார்கழி"
@@ -190,75 +190,75 @@ msgstr "கடந்த வருடம்"
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "தெரிவுசெய்க "
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ஆம்"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "இல்லை"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "தெரிவுசெய்க "
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "சரி"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "இரத்து செய்க"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr "பகிர்வு"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "வழு"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "பகிரும் போதான வழு"
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "கடவுச்சொல்"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "கடவுச்சொல்"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "காலாவதி தேதியை குறிப்பிடுக"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "காலவதியாகும் திகதி"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "மின்னஞ்சலினூடான பகிர்வு: "
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "நபர்கள் யாரும் இல்லை"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "குழு"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "மீள்பகிர்வதற்கு அனுமதி இல்லை "
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "பகிரப்படாதது"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "தொகுக்க முடியும்"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "கட்டுப்பாடான அணுகல்"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "உருவவாக்கல்"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "இற்றைப்படுத்தல்"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "நீக்குக"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "பகிர்தல்"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "எச்சரிக்கை"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 8a59e664b2..1251d1d6f9 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/te/core.po b/l10n/te/core.po
index ce24480329..4a3f003ce9 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ఆదివారం"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "సోమవారం"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "మంగళవారం"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "బుధవారం"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "గురువారం"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "శుక్రవారం"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "శనివారం"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "జనవరి"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ఫిబ్రవరి"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "మార్చి"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ఏప్రిల్"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "మే"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "జూన్"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "జూలై"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ఆగస్ట్"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "సెప్టెంబర్"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "అక్టోబర్"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "నవంబర్"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "డిసెంబర్"
@@ -191,75 +191,75 @@ msgstr "పోయిన సంవత్సరం"
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "అవును"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "కాదు"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "సరే"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "రద్దుచేయి"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "కొనసాగించు"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,12 +291,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "పొరపాటు"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -324,107 +324,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "సంకేతపదం"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "సంకేతపదం"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "పంపించు"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "కాలం చెల్లు తేదీ"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "తొలగించు"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "హెచ్చరిక"
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 95f442bdbc..fa9ea71c33 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index f785109194..15e0ae7b90 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -59,79 +59,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
@@ -291,12 +291,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -324,107 +324,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 1932b17d7f..47e471c3fa 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 2866e6567d..66bce53701 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 8b2dd31dc5..dc6bdd259e 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index e0cf9c3d7f..741ad7aa14 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index bad146a524..3b7149985b 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 5b5130a424..31447abc3a 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index b099836864..3423da5b65 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index bad5160c97..172151de60 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 94de0818fa..692cd708ea 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -188,7 +188,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -513,61 +513,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 040dfb2653..0b63cad3ec 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index d85a5b5d2a..53201e4b0e 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 397e020849..d44e39a74b 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "วันอาทิตย์"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "วันจันทร์"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "วันอังคาร"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "วันพุธ"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "วันพฤหัสบดี"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "วันศุกร์"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "วันเสาร์"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "มกราคม"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "กุมภาพันธ์"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "มีนาคม"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "เมษายน"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "พฤษภาคม"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "มิถุนายน"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "กรกฏาคม"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "สิงหาคม"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "กันยายน"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ตุลาคม"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "พฤศจิกายน"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ธันวาคม"
@@ -186,74 +186,74 @@ msgstr "ปีที่แล้ว"
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "เลือก"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ตกลง"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ไม่ตกลง"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "เลือก"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "ตกลง"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "ไฟล์ใหม่"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ยกเลิก"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr "แชร์แล้ว"
msgid "Share"
msgstr "แชร์"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "ข้อผิดพลาด"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "ใส่รหัสผ่านไว้"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "รหัสผ่าน"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "ใส่รหัสผ่านไว้"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "รหัสผ่าน"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr "ส่งลิงก์ให้ทางอีเมล"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "ส่ง"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "กำหนดวันที่หมดอายุ"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "วันที่หมดอายุ"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "แชร์ผ่านทางอีเมล"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "ไม่พบบุคคลที่ต้องการ"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "กลุ่มผู้ใช้งาน"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "ได้แชร์ {item} ให้กับ {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "ยกเลิกการแชร์"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "สามารถแก้ไข"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "ระดับควบคุมการเข้าใช้งาน"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "สร้าง"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "อัพเดท"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "ลบ"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "แชร์"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "กำลังส่ง..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "ส่งอีเมล์แล้ว"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "คำเตือน"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index da72e44092..cfb1b1902c 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr "อนุญาตให้แอปฯสามารถใช้ API
msgid "Allow links"
msgstr "อนุญาตให้ใช้งานลิงก์ได้"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index d70404da9d..0edbd7a937 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -62,79 +62,79 @@ msgstr "Kullanılabilir geçici profil resmi yok, tekrar deneyin"
msgid "No crop data provided"
msgstr "Kesme verisi sağlanmamış"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Pazar"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pazartesi"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Salı"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Çarşamba"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Perşembe"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Cuma"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Cumartesi"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Ocak"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Şubat"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mart"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Nisan"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayıs"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Haziran"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Temmuz"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Ağustos"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Eylül"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Ekim"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Kasım"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Aralık"
@@ -194,75 +194,75 @@ msgstr "geçen yıl"
msgid "years ago"
msgstr "yıllar önce"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seç"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Dosya seçici şablonu yüklenirken hata: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Evet"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Hayır"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seç"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Dosya seçici şablonu yüklenirken hata: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Tamam"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "İleti şablonu yüklenirken hata: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} dosya çakışması"
msgstr[1] "{count} dosya çakışması"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Bir dosya çakışması"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Yeni Dosyalar"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Zaten mevcut olan dosyalar"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Hangi dosyaları saklamak istiyorsunuz?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "İptal"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Devam et"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(tümü seçildi)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seçildi)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Dosya mevcut şablonu yüklenirken hata"
@@ -294,12 +294,12 @@ msgstr "Paylaşılan"
msgid "Share"
msgstr "Paylaş"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Hata"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Paylaşım sırasında hata"
@@ -327,107 +327,116 @@ msgstr "Kullanıcı veya grup ile paylaş..."
msgid "Share link"
msgstr "Paylaşma bağlantısı"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Parola koruması"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Parola"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Herkes Tarafından Gönderime İzin Ver"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Bağlantıyı e-posta ile gönder"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Gönder"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Son kullanma tarihini ayarla"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Son kullanım tarihi"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "E-posta ile paylaş:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Kişi bulunamadı"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "grup"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Tekrar paylaşmaya izin verilmiyor"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "{item} içinde {user} ile paylaşılanlar"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Paylaşılmayan"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "e-posta ile bildir"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "düzenleyebilir"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "erişim kontrolü"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "oluştur"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "güncelle"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "sil"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "paylaş"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Parola korumalı"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Son kullanma tarihi kaldırma hatası"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Son kullanma tarihi ayarlama hatası"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Gönderiliyor..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "E-posta gönderildi"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Uyarı"
@@ -725,7 +734,7 @@ msgstr "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesi
#: templates/layout.user.php:44
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr "%s mevcut. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın."
+msgstr "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın."
#: templates/layout.user.php:74 templates/singleuser.user.php:8
msgid "Log out"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 76d669faea..2a93a66dfa 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 10:51+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-14 23:42+0000\n"
"Last-Translator: volkangezer \n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgid ""
"Your private key is not valid! Likely your password was changed outside of "
"%s (e.g. your corporate directory). You can update your private key password"
" in your personal settings to recover access to your encrypted files."
-msgstr "Gizli anahtarınız geçerli değil! Muhtemelen parolanız ownCloud sistemi %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz."
+msgstr "Gizli anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz."
#: files/error.php:19
msgid ""
@@ -113,91 +113,91 @@ msgstr "Doğrudan şuraya gidin:"
msgid "personal settings"
msgstr "kişisel ayarlar"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Şifreleme"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Kurtarma anahtarı parolası"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Kurtarma anahtarı parolasını yenileyin"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Etkinleştirildi"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Devre dışı"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Kurtarma anahtarı parolasını değiştir:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Eski Kurtarma anahtar parolası"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Yeni Kurtarma anahtar parolası"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Yeni Kurtarma anahtarı parolasını yenileyin"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Parola Değiştir"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Özel anahtar parolanız artık oturum açma parolanızla eşleşmiyor:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Eski özel anahtar parolanızı geçerli oturum açma parolanız olarak ayarlayın."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Eski oturum açma parolası"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Geçerli oturum açma parolası"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Özel Anahtar Parolasını Güncelle"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Parola kurtarmayı etkinleştir:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Dosya kurtarma ayarları güncellendi"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Dosya kurtarma güncellenemedi"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 2cbcdca3f3..d88f76e446 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -104,13 +104,13 @@ msgstr "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yen
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Şifreleme anahtarları kalıcı olarak silindi"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -130,13 +130,13 @@ msgstr "Kullanıcı silinemiyor"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Yedekler başarıyla geri yüklendi"
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -193,7 +193,7 @@ msgstr "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme
msgid "Unable to change password"
msgstr "Parola değiştirilemiyor"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "Gönderiliyor..."
@@ -279,11 +279,11 @@ msgstr "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman a
#: js/personal.js:324
msgid "Delete encryptin keys permanently."
-msgstr ""
+msgstr "Şifreleme anahtarlarını kalıcı olarak sil."
#: js/personal.js:338
msgid "Restore encryptin keys."
-msgstr ""
+msgstr "Şifreleme anahtarlarını geri yükle."
#: js/users.js:47
msgid "deleted"
@@ -518,62 +518,53 @@ msgstr "Uygulamaların paylaşım API'sini kullanmasına izin ver"
msgid "Allow links"
msgstr "Bağlantılara izin ver"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "Herkes tarafından yüklemeye izin ver"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Kullanıcıların, herkese açık dizinlerine, başkalarının dosya yüklemelerini etkinleştirmelerine izin ver"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Paylaşıma izin ver"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Kullanıcıların her şeyi paylaşmalarına izin ver"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "Posta bilgilendirmesine izin ver"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "Öntanımlı son kullanma tarihini ayarla"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "Şu süreden sonra süresi dolsun"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "gün"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "Son kullanma tarihini zorla"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Paylaşıma izin ver"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Kullanıcıların her şeyi paylaşmalarına izin ver"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "Posta bilgilendirmesine izin ver"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Paylaşımların süresini öntanımlı olarak N günden sonra doldur"
+msgid "Allow users to send mail notification for shared files"
+msgstr "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver"
#: templates/admin.php:278
msgid "Security"
@@ -719,7 +710,7 @@ msgstr "Ticari Destek"
#: templates/personal.php:8
msgid "Get the apps to sync your files"
-msgstr "Dosyalarınızı eşitlemek için uygulamayı indirin"
+msgstr "Dosyalarınızı eşitlemek için uygulamaları indirin"
#: templates/personal.php:19
msgid "Show First Run Wizard again"
@@ -840,15 +831,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın düzgün bir şekilde şifrelerinin çözüldüğünden eminseniz kalıcı olarak silin."
#: templates/personal.php:184
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Şifreleme Anahtarlarını Geri Yükle"
#: templates/personal.php:188
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Şifreleme Anahtarlarını Sil"
#: templates/users.php:19
msgid "Login Name"
diff --git a/l10n/tzm/core.po b/l10n/tzm/core.po
index 30ead15ba0..a56ba008ba 100644
--- a/l10n/tzm/core.po
+++ b/l10n/tzm/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/tzm/settings.po b/l10n/tzm/settings.po
index d34209d702..b0da1aebeb 100644
--- a/l10n/tzm/settings.po
+++ b/l10n/tzm/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 1dddf22f20..bf279260a2 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "يەكشەنبە"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "دۈشەنبە"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "سەيشەنبە"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "چارشەنبە"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "پەيشەنبە"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "جۈمە"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "شەنبە"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "قەھرىتان"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ھۇت"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "نەۋرۇز"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ئۇمۇت"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "باھار"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "سەپەر"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "چىللە"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "تومۇز"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "مىزان"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ئوغۇز"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ئوغلاق"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "كۆنەك"
@@ -186,74 +186,74 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ھەئە"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ياق"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "جەزملە"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ۋاز كەچ"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr ""
msgid "Share"
msgstr "ھەمبەھىر"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "خاتالىق"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "ئىم"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "ئىم"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "يوللا"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "گۇرۇپپا"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "ھەمبەھىرلىمە"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "ئۆچۈر"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "ھەمبەھىر"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "ئاگاھلاندۇرۇش"
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index d6d482e80d..ae8011c9e2 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 6626023df6..99bc90c23f 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: azdk94 \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -60,79 +60,79 @@ msgstr "Немає доступного тимчасового профілю д
msgid "No crop data provided"
msgstr "Немає інформації щодо обрізки даних"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Неділя"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понеділок"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Вівторок"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Середа"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четвер"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "П'ятниця"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Субота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Січень"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Лютий"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Березень"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Квітень"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Травень"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Червень"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Липень"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Серпень"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Вересень"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Жовтень"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Листопад"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Грудень"
@@ -196,76 +196,76 @@ msgstr "минулого року"
msgid "years ago"
msgstr "роки тому"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Обрати"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Помилка при завантаженні шаблону вибору: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ні"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Обрати"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Помилка при завантаженні шаблону вибору: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Помилка при завантаженні шаблону повідомлення: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} файловий конфлікт"
msgstr[1] "{count} файлових конфліктів"
msgstr[2] "{count} файлових конфліктів"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Один файловий конфлікт"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Нових Файлів"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Які файли ви хочете залишити?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Відмінити"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Продовжити"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(все вибрано)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} вибрано)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Помилка при завантаженні файлу існуючого шаблону"
@@ -297,12 +297,12 @@ msgstr "Опубліковано"
msgid "Share"
msgstr "Поділитися"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Помилка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Помилка під час публікації"
@@ -330,107 +330,116 @@ msgstr "Поділитися з користувачем або групою ...
msgid "Share link"
msgstr "Опублікувати посилання"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Захистити паролем"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Пароль"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Дозволити Публічне Завантаження"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Ел. пошта належить Пану"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Надіслати"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Встановити термін дії"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Термін дії"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Опублікувати через Ел. пошту:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Жодної людини не знайдено"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "група"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Пере-публікація не дозволяється"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Опубліковано {item} для {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Закрити доступ"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "повідомити по Email"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "може редагувати"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "контроль доступу"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "створити"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "оновити"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "видалити"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "опублікувати"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Захищено паролем"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Помилка при відміні терміна дії"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Помилка при встановленні терміна дії"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Надсилання..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Ел. пошта надіслана"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Попередження"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 16a78a603d..fec3a64d24 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr "Дозволити програмам використовувати API
msgid "Allow links"
msgstr "Дозволити посилання"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Дозволити перевідкривати спільний доступ"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Дозволити користувачам відкривати спільний доступ для всіх"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Дозволити перевідкривати спільний доступ"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Дозволити користувачам відкривати спільний доступ для всіх"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ur/core.po b/l10n/ur/core.po
index 7324073f77..d58b94fefe 100644
--- a/l10n/ur/core.po
+++ b/l10n/ur/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/ur/settings.po b/l10n/ur/settings.po
index 073cff5ba2..e8f1fa0d26 100644
--- a/l10n/ur/settings.po
+++ b/l10n/ur/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index bd93f5eacd..20b23ea014 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "جنوری"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "فرورئ"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "مارچ"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "اپریل"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "مئی"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "جون"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "جولائی"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "اگست"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ستمبر"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "اکتوبر"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "نومبر"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "دسمبر"
@@ -190,75 +190,75 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "منتخب کریں"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ہاں"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "نہیں"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "منتخب کریں"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "اوکے"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "منسوخ کریں"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,12 +290,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "ایرر"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "شئیرنگ کے دوران ایرر"
@@ -323,107 +323,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "پاسورڈ سے محفوظ کریں"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "پاسورڈ"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "پاسورڈ سے محفوظ کریں"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "پاسورڈ"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "تاریخ معیاد سیٹ کریں"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "تاریخ معیاد"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "کوئی لوگ نہیں ملے۔"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "دوبارہ شئیر کرنے کی اجازت نہیں"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "شئیرنگ ختم کریں"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "ایڈٹ کر سکے"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "اسیس کنٹرول"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "نیا بنائیں"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "اپ ڈیٹ"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "ختم کریں"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "شئیر کریں"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 4d782fd7e4..35eca0f6b8 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index f673c079f6..f561a95aff 100644
--- a/l10n/uz/core.po
+++ b/l10n/uz/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -58,202 +58,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:483
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:583
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1240
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1241
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1242
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1249
+#: js/js.js:1243
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1244
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1245
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1252
+#: js/js.js:1246
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1247
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1254
+#: js/js.js:1248
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1249
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr ""
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr ""
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
-msgid "Email link to person"
+msgid "Password protect"
msgstr ""
-#: js/share.js:235
-msgid "Send"
-msgstr ""
-
-#: js/share.js:240
-msgid "Set expiration date"
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
msgstr ""
#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/uz/settings.po b/l10n/uz/settings.po
index 53b0b5905d..bcf1d794d9 100644
--- a/l10n/uz/settings.po
+++ b/l10n/uz/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 4308d09f21..2a131fb848 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -62,79 +62,79 @@ msgstr "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại"
msgid "No crop data provided"
msgstr "Không có dữ liệu nguồn được cung cấp"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Chủ nhật"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Thứ 2"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Thứ 3"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Thứ 4"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Thứ 5"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Thứ "
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Thứ 7"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Tháng 1"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Tháng 2"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Tháng 3"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Tháng 4"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Tháng 5"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Tháng 6"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Tháng 7"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Tháng 8"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Tháng 9"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Tháng 10"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Tháng 11"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Tháng 12"
@@ -190,74 +190,74 @@ msgstr "năm trước"
msgid "years ago"
msgstr "năm trước"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Chọn"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Lỗi khi tải mẫu tập tin picker: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Có"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Không"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Chọn"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Lỗi khi tải mẫu tập tin picker: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Đồng ý"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Lỗi khi tải mẫu thông điệp: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} tập tin xung đột"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Một tập tin xung đột"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "File mới"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Bạn muốn tiếp tục với những tập tin nào?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Hủy"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Tiếp tục"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(Tất cả các lựa chọn)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} được chọn)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Lỗi khi tải tập tin mẫu đã tồn tại"
@@ -289,12 +289,12 @@ msgstr "Được chia sẻ"
msgid "Share"
msgstr "Chia sẻ"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "Lỗi"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "Lỗi trong quá trình chia sẻ"
@@ -322,107 +322,116 @@ msgstr "Chia sẻ với người dùng hoặc nhóm"
msgid "Share link"
msgstr "Chia sẻ liên kết"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "Mật khẩu bảo vệ"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "Mật khẩu"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "Cho phép công khai tập tin tải lên"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "Liên kết email tới cá nhân"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "Gởi"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "Đặt ngày kết thúc"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "Ngày kết thúc"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "Chia sẻ thông qua email"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "Không tìm thấy người nào"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "nhóm"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "Chia sẻ lại không được cho phép"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "Đã được chia sẽ trong {item} với {user}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "Bỏ chia sẻ"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "Thông báo qua email"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "có thể chỉnh sửa"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "quản lý truy cập"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "tạo"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "cập nhật"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "xóa"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "chia sẻ"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "Mật khẩu bảo vệ"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "Lỗi không thiết lập ngày kết thúc"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "Lỗi cấu hình ngày kết thúc"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "Đang gởi ..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email đã được gửi"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "Cảnh báo"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 7b5f228ad5..af53b572ef 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -515,61 +515,52 @@ msgstr "Cho phép các ứng dụng sử dụng chia sẻ API"
msgid "Allow links"
msgstr "Cho phép liên kết"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Cho phép chia sẻ lại"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Cho phép người dùng chia sẻ với bất cứ ai"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "Cho phép chia sẻ lại"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "Cho phép người dùng chia sẻ với bất cứ ai"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index c549f6d7fd..7db9536abf 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: Xuetian Weng \n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -63,79 +63,79 @@ msgstr "没有临时概览页图片可用,请重试"
msgid "No crop data provided"
msgstr "没有提供相应数据"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "星期日"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "星期一"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "星期二"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "星期三"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "星期四"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "星期五"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "星期六"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "一月"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "二月"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "三月"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "四月"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "五月"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "六月"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "七月"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "八月"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "九月"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "十月"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "十一月"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "十二月"
@@ -191,74 +191,74 @@ msgstr "去年"
msgid "years ago"
msgstr "年前"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "选择(&C)..."
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "加载文件分拣模板出错: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "选择(&C)..."
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "加载文件分拣模板出错: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "好"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "加载消息模板出错: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} 个文件冲突"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "1个文件冲突"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "新文件"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "已经存在的文件"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "想要保留哪一个文件呢?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "如果同时选择了连个版本,复制的文件名将会添加上一个数字。"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "继续"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(选中全部)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "(选择了{count}个)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "加载文件存在性模板失败"
@@ -290,12 +290,12 @@ msgstr "已共享"
msgid "Share"
msgstr "分享"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "错误"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "共享时出错"
@@ -323,107 +323,116 @@ msgstr "分享给其他用户或组 ..."
msgid "Share link"
msgstr "分享链接"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "密码保护"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "密码"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "允许公开上传"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "发送链接到个人"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "发送"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "设置过期日期"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "过期日期"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "通过Email共享"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "未找到此人"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "组"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "不允许二次共享"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "在 {item} 与 {user} 共享。"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "取消共享"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "以邮件通知"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "可以修改"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "访问控制"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "创建"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "更新"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "删除"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "共享"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "密码已受保护"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "取消设置过期日期时出错"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "设置过期日期时出错"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "正在发送..."
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "邮件已发送"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "警告"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 12efd3bf85..1053498b96 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -196,7 +196,7 @@ msgstr "后端不支持修改密码,但是用户的加密密码已成功更新
msgid "Unable to change password"
msgstr "不能更改密码"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "正在发送..."
@@ -521,62 +521,53 @@ msgstr "允许应用软件使用共享API"
msgid "Allow links"
msgstr "允许链接"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "允许用户使用连接公开共享项目"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "允许公开上传"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "用户可让其他人上传到他的公开共享文件夹"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "允许再次共享"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "允许用户将共享给他们的项目再次共享"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "允许用户向任何人共享"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "允许用户只向同组用户共享"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "允许邮件通知"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "允许用户发送共享文件的邮件通知"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr "设置默认过期日期"
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr "过期于"
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr "天"
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr "强制过期日期"
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "允许用户使用连接公开共享项目"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "允许再次共享"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "允许用户将共享给他们的项目再次共享"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "允许用户向任何人共享"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "允许用户只向同组用户共享"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "允许邮件通知"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "默认 N 天后共享过期"
+msgid "Allow users to send mail notification for shared files"
+msgstr "允许用户发送共享文件的邮件通知"
#: templates/admin.php:278
msgid "Security"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 057f8cd10b..fd330e3dfa 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -58,79 +58,79 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "星期日"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "星期一"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "星期二"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "星期三"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "星期四"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "星期五"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "星期六"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "一月"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "二月"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "三月"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "四月"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "五月"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "六月"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "七月"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "八月"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "九月"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "十月"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "十一月"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "十二月"
@@ -186,74 +186,74 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,12 +285,12 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "錯誤"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "分享時發生錯誤"
@@ -318,107 +318,116 @@ msgstr ""
msgid "Share link"
msgstr ""
-#: js/share.js:223
-msgid "Password protect"
-msgstr "密碼保護"
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "密碼"
-
-#: js/share.js:230
-msgid "Allow Public Upload"
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
msgstr ""
#: js/share.js:234
+msgid "Password protect"
+msgstr "密碼保護"
+
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "密碼"
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "傳送"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "設定分享期限"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "分享期限"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "以電郵分享"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "找不到"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "取消分享"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "新增"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "更新"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "刪除"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "分享"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "密碼保護"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "傳送中"
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "郵件已傳"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 5c1bd697d6..055d487c6d 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr ""
@@ -514,61 +514,52 @@ msgstr ""
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr ""
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
msgstr ""
#: templates/admin.php:278
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index a3ed36042a..9868194028 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -60,79 +60,79 @@ msgstr "沒有臨時用的大頭貼,請再試一次"
msgid "No crop data provided"
msgstr "未設定剪裁"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "週日"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "週一"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "週二"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "週三"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "週四"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "週五"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "週六"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "一月"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "二月"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "三月"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "四月"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "五月"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "六月"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "七月"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "八月"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "九月"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "十月"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "十一月"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "十二月"
@@ -188,74 +188,74 @@ msgstr "去年"
msgid "years ago"
msgstr "幾年前"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "選擇"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "載入檔案選擇器樣板出錯: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "選擇"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "載入檔案選擇器樣板出錯: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "好"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "載入訊息樣板出錯: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} 個檔案衝突"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "一個檔案衝突"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "新檔案"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "您要保留哪一個檔案?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "如果您同時選擇兩個版本,被複製的那個檔案名稱後面會加上編號"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "繼續"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(已全選)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "(已選 {count} 項)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "載入檔案存在樣板出錯"
@@ -287,12 +287,12 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
#: templates/installation.php:10
msgid "Error"
msgstr "錯誤"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
msgid "Error while sharing"
msgstr "分享時發生錯誤"
@@ -320,107 +320,116 @@ msgstr "與用戶或群組分享"
msgid "Share link"
msgstr "分享連結"
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
msgid "Password protect"
msgstr "密碼保護"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "密碼"
-#: js/share.js:230
+#: js/share.js:241
msgid "Allow Public Upload"
msgstr "允許任何人上傳"
-#: js/share.js:234
+#: js/share.js:245
msgid "Email link to person"
msgstr "將連結 email 給別人"
-#: js/share.js:235
+#: js/share.js:246
msgid "Send"
msgstr "寄出"
-#: js/share.js:240
+#: js/share.js:251
msgid "Set expiration date"
msgstr "指定到期日"
-#: js/share.js:241
+#: js/share.js:252
msgid "Expiration date"
msgstr "到期日"
-#: js/share.js:277
+#: js/share.js:289
msgid "Share via email:"
msgstr "透過電子郵件分享:"
-#: js/share.js:280
+#: js/share.js:292
msgid "No people found"
msgstr "沒有找到任何人"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
msgid "group"
msgstr "群組"
-#: js/share.js:357
+#: js/share.js:369
msgid "Resharing is not allowed"
msgstr "不允許重新分享"
-#: js/share.js:401
+#: js/share.js:413
msgid "Shared in {item} with {user}"
msgstr "已和 {user} 分享 {item}"
-#: js/share.js:423
+#: js/share.js:435
msgid "Unshare"
msgstr "取消分享"
-#: js/share.js:431
+#: js/share.js:443
msgid "notify by email"
msgstr "以 email 通知"
-#: js/share.js:434
+#: js/share.js:446
msgid "can edit"
msgstr "可編輯"
-#: js/share.js:436
+#: js/share.js:448
msgid "access control"
msgstr "存取控制"
-#: js/share.js:439
+#: js/share.js:451
msgid "create"
msgstr "建立"
-#: js/share.js:442
+#: js/share.js:454
msgid "update"
msgstr "更新"
-#: js/share.js:445
+#: js/share.js:457
msgid "delete"
msgstr "刪除"
-#: js/share.js:448
+#: js/share.js:460
msgid "share"
msgstr "分享"
-#: js/share.js:721
+#: js/share.js:734
msgid "Password protected"
msgstr "受密碼保護"
-#: js/share.js:734
+#: js/share.js:747
msgid "Error unsetting expiration date"
msgstr "取消到期日設定失敗"
-#: js/share.js:752
+#: js/share.js:768
msgid "Error setting expiration date"
msgstr "設定到期日發生錯誤"
-#: js/share.js:777
+#: js/share.js:797
msgid "Sending ..."
msgstr "正在傳送…"
-#: js/share.js:788
+#: js/share.js:808
msgid "Email sent"
msgstr "Email 已寄出"
-#: js/share.js:812
+#: js/share.js:832
msgid "Warning"
msgstr "警告"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index b1c3b2a44c..df213c40f1 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -191,7 +191,7 @@ msgstr "後端不支援變更密碼,但成功更新使用者的加密金鑰"
msgid "Unable to change password"
msgstr "無法修改密碼"
-#: js/admin.js:73
+#: js/admin.js:81
msgid "Sending..."
msgstr "寄送中..."
@@ -516,62 +516,53 @@ msgstr "允許 apps 使用分享 API"
msgid "Allow links"
msgstr "允許連結"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "允許使用者以結連公開分享檔案"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
msgid "Allow public uploads"
msgstr "允許任何人上傳"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "允許使用者將他們公開分享的資料夾設定為「任何人皆可上傳」"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "允許轉貼分享"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "允許使用者分享其他使用者分享給他的檔案"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "允許使用者與任何人分享檔案"
-
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
-msgstr "僅允許使用者在群組內分享"
-
-#: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr "允許郵件通知"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "允許使用者寄送有關分享檔案的郵件通知"
-
-#: templates/admin.php:262
+#: templates/admin.php:229
msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:263
+#: templates/admin.php:231
msgid "Expire after "
msgstr ""
-#: templates/admin.php:266
+#: templates/admin.php:234
msgid "days"
msgstr ""
-#: templates/admin.php:269
+#: templates/admin.php:237
msgid "Enforce expiration date"
msgstr ""
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "允許使用者以結連公開分享檔案"
+
+#: templates/admin.php:251
+msgid "Allow resharing"
+msgstr "允許轉貼分享"
+
+#: templates/admin.php:252
+msgid "Allow users to share items shared with them again"
+msgstr "允許使用者分享其他使用者分享給他的檔案"
+
+#: templates/admin.php:259
+msgid "Allow users to share with anyone"
+msgstr "允許使用者與任何人分享檔案"
+
+#: templates/admin.php:262
+msgid "Allow users to only share with users in their groups"
+msgstr "僅允許使用者在群組內分享"
+
+#: templates/admin.php:269
+msgid "Allow mail notification"
+msgstr "允許郵件通知"
+
#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+msgid "Allow users to send mail notification for shared files"
+msgstr "允許使用者寄送有關分享檔案的郵件通知"
#: templates/admin.php:278
msgid "Security"
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 109104e406..20fcccf770 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -67,7 +67,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","%n μήνες πριν"),
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Μόνο οι παρακάτων χαρακτήρες επιτρέπονται σε ένα όνομα χρήστη: \"a-z\", \"A-Z\", \"0-9\" και \"_.@-\"",
"A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
-"A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό"
+"A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό",
+"The username is already being used" => "Το όνομα χρήστη είναι κατειλημμένο"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index d62c69adfa..d610653e2f 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -93,9 +93,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "السماح بالمشاركة عن طريق الAPI ",
"Allow apps to use the Share API" => "السماح للتطبيقات بالمشاركة عن طريق الAPI",
"Allow links" => "السماح بالعناوين",
-"Allow users to share items to the public with links" => "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط ",
"Allow public uploads" => "السماح بالرفع للعامة ",
-"Allow users to enable others to upload into their publicly shared folders" => "السماح للمستخدمين بتفعيل الرفع للاخرين من خلال مجلد المشاركة العام ",
+"Allow users to share items to the public with links" => "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط ",
"Allow resharing" => "السماح بإعادة المشاركة ",
"Allow users to share items shared with them again" => "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم",
"Allow users to share with anyone" => "السماح للمستعملين بإعادة المشاركة مع أي أحد ",
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index 99dc480038..f443255039 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -106,20 +106,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar API de Compartición",
"Allow apps to use the Share API" => "Permitir a les aplicaciones usar la API de Compartición",
"Allow links" => "Permitir enllaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces",
"Allow public uploads" => "Permitir xubes públiques",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros pa xubir ficheros nes sos carpetes compartíes públicamente",
+"Set default expiration date" => "Afitar la data d'espiración predeterminada",
+"Expire after " => "Caduca dempués de",
+"days" => "díes",
+"Enforce expiration date" => "Facer cumplir la data de caducidá",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces",
"Allow resharing" => "Permitir re-compartición",
"Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevu elementos ya compartíos",
"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualesquier persona",
"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir namái colos usuarios nos sos grupos",
"Allow mail notification" => "Permitir notificaciones per corréu-e",
"Allow users to send mail notification for shared files" => "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
-"Set default expiration date" => "Afitar la data d'espiración predeterminada",
-"Expire after " => "Caduca dempués de",
-"days" => "díes",
-"Enforce expiration date" => "Facer cumplir la data de caducidá",
-"Expire shares by default after N days" => "Ficheros compartíos caduquen dempués de N díes",
"Security" => "Seguridá",
"Enforce HTTPS" => "Forciar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 0a4324e5a5..56ee61760b 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -106,9 +106,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Habilita l'API de compartir",
"Allow apps to use the Share API" => "Permet que les aplicacions utilitzin l'API de compartir",
"Allow links" => "Permet enllaços",
-"Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el públic amb enllaços",
"Allow public uploads" => "Permet pujada pública",
-"Allow users to enable others to upload into their publicly shared folders" => "Permet als usuaris habilitar pujades de tercers en les seves carpetes compartides al públic",
+"Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el públic amb enllaços",
"Allow resharing" => "Permet compartir de nou",
"Allow users to share items shared with them again" => "Permet als usuaris compartir de nou elements ja compartits amb ells",
"Allow users to share with anyone" => "Permet compartir amb qualsevol",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index e4fbf0c65b..b541f98313 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -106,20 +106,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Povolit API sdílení",
"Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
"Allow links" => "Povolit odkazy",
-"Allow users to share items to the public with links" => "Povolit uživatelům sdílet položky veřejně pomocí odkazů",
"Allow public uploads" => "Povolit veřejné nahrávání souborů",
-"Allow users to enable others to upload into their publicly shared folders" => "Povolit uživatelům, aby mohli ostatním umožnit nahrávat do jejich veřejně sdílené složky",
+"Set default expiration date" => "Nastavit výchozí datum vypršení platnosti",
+"Expire after " => "Vyprší po",
+"days" => "dnech",
+"Enforce expiration date" => "Vynutit datum vypršení",
+"Allow users to share items to the public with links" => "Povolit uživatelům sdílet položky veřejně pomocí odkazů",
"Allow resharing" => "Povolit znovu-sdílení",
"Allow users to share items shared with them again" => "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny",
"Allow users to share with anyone" => "Povolit uživatelům sdílet s kýmkoliv",
"Allow users to only share with users in their groups" => "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách",
"Allow mail notification" => "Povolit e-mailová upozornění",
"Allow users to send mail notification for shared files" => "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
-"Set default expiration date" => "Nastavit výchozí datum vypršení platnosti",
-"Expire after " => "Vyprší po",
-"days" => "dnech",
-"Enforce expiration date" => "Vynutit datum vypršení",
-"Expire shares by default after N days" => "Výchozí lhůta vypršení sdílení po N dnech",
"Security" => "Zabezpečení",
"Enforce HTTPS" => "Vynutit HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Vynutí připojování klientů k %s šifrovaným spojením.",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index d4f1ae2194..271169c9dc 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -93,16 +93,15 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktiver Share API",
"Allow apps to use the Share API" => "Tillad apps til at bruge Share API",
"Allow links" => "Tillad links",
-"Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links",
"Allow public uploads" => "Tillad offentlig upload",
-"Allow users to enable others to upload into their publicly shared folders" => "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper",
+"Expire after " => "Udløber efter",
+"days" => "dage",
+"Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links",
"Allow resharing" => "Tillad videredeling",
"Allow users to share items shared with them again" => "Tillad brugere at dele elementer delt med dem igen",
"Allow users to share with anyone" => "Tillad brugere at dele med alle",
"Allow users to only share with users in their groups" => "Tillad brugere at kun dele med brugerne i deres grupper",
"Allow mail notification" => "Tillad mail underretninger",
-"Expire after " => "Udløber efter",
-"days" => "dage",
"Security" => "Sikkerhed",
"Enforce HTTPS" => "Gennemtving HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 2b3060dd6d..e4eb5b10b1 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
+"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
"Email saved" => "E-Mail Adresse gespeichert",
"Invalid email" => "Ungültige E-Mail Adresse",
"Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
"Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
+"Backups restored successfully" => "Backups erfolgreich wiederhergestellt",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
"Language changed" => "Sprache geändert",
"Invalid request" => "Fehlerhafte Anfrage",
"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Gutes Passwort",
"Strong password" => "Starkes Passwort",
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
+"Delete encryptin keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen",
+"Restore encryptin keys." => "Verschlüsselungsschlüssel wiederherstellen",
"deleted" => "gelöscht",
"undo" => "rückgängig machen",
"Unable to remove user" => "Benutzer konnte nicht entfernt werden.",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktiviere Sharing-API",
"Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API",
"Allow links" => "Erlaubt Links",
-"Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
"Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
+"Set default expiration date" => "Setze Ablaufdatum",
+"Expire after " => "Ablauf nach dem",
+"days" => "Tage",
+"Enforce expiration date" => "Ablaufdatum erzwingen",
+"Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
"Allow resharing" => "Erlaubt erneutes Teilen",
"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
"Allow mail notification" => "Mail-Benachrichtigung erlauben",
"Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Set default expiration date" => "Setze Ablaufdatum",
-"Expire after " => "Ablauf nach dem",
-"days" => "Tage",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Expire shares by default after N days" => "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen",
"Security" => "Sicherheit",
"Enforce HTTPS" => "Erzwinge HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
@@ -181,6 +185,9 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.",
"Log-in password" => "Login-Passwort",
"Decrypt all Files" => "Alle Dateien entschlüsseln",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
+"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
+"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
"Login Name" => "Loginname",
"Create" => "Anlegen",
"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index 9bfe06d023..5ad804b526 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -57,9 +57,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Share-API aktivieren",
"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
"Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
"Allow public uploads" => "Erlaube öffentliches hochladen",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
+"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
"Allow resharing" => "Erlaube Weiterverteilen",
"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index b5c0985cec..23dd6e0381 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
+"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
"Email saved" => "E-Mail-Adresse gespeichert",
"Invalid email" => "Ungültige E-Mail-Adresse",
"Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
"Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
+"Backups restored successfully" => "Backups erfolgreich wiederhergestellt",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
"Language changed" => "Sprache geändert",
"Invalid request" => "Ungültige Anforderung",
"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Gutes Passwort",
"Strong password" => "Starkes Passwort",
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+"Delete encryptin keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen",
+"Restore encryptin keys." => "Verschlüsselungsschlüssel wiederherstellen",
"deleted" => "gelöscht",
"undo" => "rückgängig machen",
"Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Share-API aktivieren",
"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
"Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
"Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
+"Set default expiration date" => "Setze Ablaufdatum",
+"Expire after " => "Ablauf nach dem",
+"days" => "Tage",
+"Enforce expiration date" => "Ablaufdatum erzwingen",
+"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
"Allow resharing" => "Erlaube Weiterverteilen",
"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
"Allow mail notification" => "Mail-Benachrichtigung erlauben",
"Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Set default expiration date" => "Setze Ablaufdatum",
-"Expire after " => "Ablauf nach dem",
-"days" => "Tage",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Expire shares by default after N days" => "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen",
"Security" => "Sicherheit",
"Enforce HTTPS" => "HTTPS erzwingen",
"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
@@ -181,6 +185,9 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten",
"Log-in password" => "Login-Passwort",
"Decrypt all Files" => "Alle Dateien entschlüsseln",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
+"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
+"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
"Login Name" => "Loginname",
"Create" => "Erstellen",
"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 9daa0a5e09..dc27b8f399 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -16,6 +16,9 @@ $TRANSLATIONS = array(
"Unable to change full name" => "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
"Group already exists" => "Η ομάδα υπάρχει ήδη",
"Unable to add group" => "Αδυναμία προσθήκης ομάδας",
+"Files decrypted successfully" => "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
+"Couldn't decrypt your files, check your password and try again" => "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
"Email saved" => "Το email αποθηκεύτηκε ",
"Invalid email" => "Μη έγκυρο email",
"Unable to delete group" => "Αδυναμία διαγραφής ομάδας",
@@ -103,16 +106,15 @@ $TRANSLATIONS = array(
"Enable Share API" => "Ενεργοποίηση API διαμοιρασμού",
"Allow apps to use the Share API" => "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
"Allow links" => "Επιτρέπονται οι σύνδεσμοι",
-"Allow users to share items to the public with links" => "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους",
"Allow public uploads" => "Επιτρέπεται το κοινόχρηστο ανέβασμα",
-"Allow users to enable others to upload into their publicly shared folders" => "Επιτρέπει τους χρήστες να καθιστούν άλλους χρήστες ικανούς να ανεβάζουν στους κοινόχρηστους φακέλους τους",
+"days" => "ημέρες",
+"Allow users to share items to the public with links" => "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους",
"Allow resharing" => "Επιτρέπεται ο επαναδιαμοιρασμός",
"Allow users to share items shared with them again" => "Επιτρέπει στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί",
"Allow users to share with anyone" => "Επιτρέπεται στους χρήστες ο διαμοιρασμός με οποιονδήποτε",
"Allow users to only share with users in their groups" => "Επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας",
"Allow mail notification" => "Επιτρέπονται ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
"Allow users to send mail notification for shared files" => "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
-"days" => "ημέρες",
"Security" => "Ασφάλεια",
"Enforce HTTPS" => "Επιβολή χρήσης HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης.",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 37dc464d67..62d0c1112e 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Files decrypted successfully",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
"Couldn't decrypt your files, check your password and try again" => "Couldn't decrypt your files, check your password and try again",
+"Encryption keys deleted permanently" => "Encryption keys deleted permanently",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
"Email saved" => "Email saved",
"Invalid email" => "Invalid email",
"Unable to delete group" => "Unable to delete group",
"Unable to delete user" => "Unable to delete user",
+"Backups restored successfully" => "Backups restored successfully",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
"Language changed" => "Language changed",
"Invalid request" => "Invalid request",
"Admins can't remove themself from the admin group" => "Admins can't remove themselves from the admin group",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Good password",
"Strong password" => "Strong password",
"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
+"Delete encryptin keys permanently." => "Delete encryption keys permanently.",
+"Restore encryptin keys." => "Restore encryption keys.",
"deleted" => "deleted",
"undo" => "undo",
"Unable to remove user" => "Unable to remove user",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Enable Share API",
"Allow apps to use the Share API" => "Allow apps to use the Share API",
"Allow links" => "Allow links",
-"Allow users to share items to the public with links" => "Allow users to share items to the public with links",
"Allow public uploads" => "Allow public uploads",
-"Allow users to enable others to upload into their publicly shared folders" => "Allow users to enable others to upload into their publicly shared folders",
+"Set default expiration date" => "Set default expiry date",
+"Expire after " => "Expire after ",
+"days" => "days",
+"Enforce expiration date" => "Enforce expiry date",
+"Allow users to share items to the public with links" => "Allow users to share items to the public with links",
"Allow resharing" => "Allow resharing",
"Allow users to share items shared with them again" => "Allow users to share items shared with them again",
"Allow users to share with anyone" => "Allow users to share with anyone",
"Allow users to only share with users in their groups" => "Allow users to only share with users in their groups",
"Allow mail notification" => "Allow mail notification",
"Allow users to send mail notification for shared files" => "Allow users to send mail notification for shared files",
-"Set default expiration date" => "Set default expiry date",
-"Expire after " => "Expire after ",
-"days" => "days",
-"Enforce expiration date" => "Enforce expiry date",
-"Expire shares by default after N days" => "Expire shares by default after N days",
"Security" => "Security",
"Enforce HTTPS" => "Enforce HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
@@ -181,6 +185,9 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "The encryption app is no longer enabled, please decrypt all your files",
"Log-in password" => "Log-in password",
"Decrypt all Files" => "Decrypt all Files",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
+"Restore Encryption Keys" => "Restore Encryption Keys",
+"Delete Encryption Keys" => "Delete Encryption Keys",
"Login Name" => "Login Name",
"Create" => "Create",
"Admin Recovery Password" => "Admin Recovery Password",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 953718bac4..f9a31d5f89 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Los archivos fueron descifrados",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
"Couldn't decrypt your files, check your password and try again" => "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
+"Encryption keys deleted permanently" => "Claves de cifrado eliminadas permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
"Email saved" => "Correo electrónico guardado",
"Invalid email" => "Correo electrónico no válido",
"Unable to delete group" => "No se pudo eliminar el grupo",
"Unable to delete user" => "No se pudo eliminar el usuario",
+"Backups restored successfully" => "Copia de seguridad restaurada",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
"Language changed" => "Idioma cambiado",
"Invalid request" => "Petición no válida",
"Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Contraseña buena",
"Strong password" => "Contraseña muy buena",
"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+"Delete encryptin keys permanently." => "Eliminar claves de cifrado.",
+"Restore encryptin keys." => "Restaurar claves de cifrado.",
"deleted" => "eliminado",
"undo" => "deshacer",
"Unable to remove user" => "Imposible eliminar al usuario",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar API de Compartición",
"Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
"Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
"Allow public uploads" => "Permitir subidas públicas",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente",
+"Set default expiration date" => "Establecer fecha de caducidad predeterminada",
+"Expire after " => "Caduca luego de",
+"days" => "días",
+"Enforce expiration date" => "Imponer fecha de caducidad",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
"Allow resharing" => "Permitir re-compartición",
"Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquier persona",
"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
"Allow mail notification" => "Permitir notificaciones por correo electrónico",
"Allow users to send mail notification for shared files" => "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
-"Set default expiration date" => "Establecer fecha de caducidad predeterminada",
-"Expire after " => "Caduca luego de",
-"days" => "días",
-"Enforce expiration date" => "Imponer fecha de caducidad",
-"Expire shares by default after N days" => "Archivos compartidos caducan luego de N días",
"Security" => "Seguridad",
"Enforce HTTPS" => "Forzar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
@@ -181,6 +185,8 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
"Log-in password" => "Contraseña de acceso",
"Decrypt all Files" => "Descifrar archivos",
+"Restore Encryption Keys" => "Restaurar claves de cifrado",
+"Delete Encryption Keys" => "Eliminar claves de cifrado",
"Login Name" => "Nombre de usuario",
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 7d834e9170..49c9b9f802 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -101,9 +101,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Habilitar Share API",
"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
"Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir enlaces públicos",
"Allow public uploads" => "Permitir subidas públicas",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios públicos compartidos",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir enlaces públicos",
"Allow resharing" => "Permitir Re-Compartir",
"Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que les fueron compartidos",
"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera.",
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 2eb3946cbb..301ee91619 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -80,9 +80,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar API de Compartición",
"Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
"Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
"Allow public uploads" => "Permitir subidas públicas",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
"Allow resharing" => "Permitir re-compartición",
"Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquier persona",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index a76b73c9ae..3044eed6cd 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -106,18 +106,16 @@ $TRANSLATIONS = array(
"Enable Share API" => "Luba Share API",
"Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
"Allow links" => "Luba lingid",
-"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
"Allow public uploads" => "Luba avalikud üleslaadimised",
-"Allow users to enable others to upload into their publicly shared folders" => "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse ",
+"Expire after " => "Aegu pärast",
+"days" => "päeva",
+"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
"Allow resharing" => "Luba edasijagamine",
"Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
"Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada",
"Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad",
"Allow mail notification" => "Luba teavitused e-postiga",
"Allow users to send mail notification for shared files" => "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
-"Expire after " => "Aegu pärast",
-"days" => "päeva",
-"Expire shares by default after N days" => "Peata jagamine N päeva möödudes",
"Security" => "Turvalisus",
"Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
"Forces the clients to connect to %s via an encrypted connection." => "Sunnib kliente %s ühenduma krüpteeritult.",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index bccbb42f5a..3d5d53e3cb 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -74,9 +74,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Gaitu Elkarbanatze APIa",
"Allow apps to use the Share API" => "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko",
"Allow links" => "Baimendu loturak",
-"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
"Allow public uploads" => "Baimendu igoera publikoak",
-"Allow users to enable others to upload into their publicly shared folders" => "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea",
+"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
"Allow resharing" => "Baimendu birpartekatzea",
"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen",
"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin elkarbanatzen",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index f42a263c3f..73f86d332e 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -68,9 +68,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "فعال کردن API اشتراک گذاری",
"Allow apps to use the Share API" => "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
"Allow links" => "اجازه ی لینک ها",
-"Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها",
"Allow public uploads" => "اجازه بارگذاری عمومی",
-"Allow users to enable others to upload into their publicly shared folders" => "به کاربران اجازه داده شود که امکان بارگذاری در پوشه هایی که بصورت عمومی به اشتراک گذاشته اند را برای سایرین فعال سازند",
+"Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها",
"Allow resharing" => "مجوز اشتراک گذاری مجدد",
"Allow users to share items shared with them again" => "اجازه به کاربران برای اشتراک گذاری دوباره با آنها",
"Allow users to share with anyone" => "اجازه به کابران برای اشتراک گذاری با همه",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index ea4d83b1c8..8476eec28d 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -19,10 +19,12 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Tiedostojen salaus purettiin onnistuneesti",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
"Couldn't decrypt your files, check your password and try again" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
+"Encryption keys deleted permanently" => "Salausavaimet poistettiin pysyvästi",
"Email saved" => "Sähköposti tallennettu",
"Invalid email" => "Virheellinen sähköposti",
"Unable to delete group" => "Ryhmän poisto epäonnistui",
"Unable to delete user" => "Käyttäjän poisto epäonnistui",
+"Backups restored successfully" => "Varmuuskopiot palautettiin onnistuneesti",
"Language changed" => "Kieli on vaihdettu",
"Invalid request" => "Virheellinen pyyntö",
"Admins can't remove themself from the admin group" => "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
@@ -96,19 +98,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Käytä jakamisen ohjelmointirajapintaa",
"Allow apps to use the Share API" => "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
"Allow links" => "Salli linkit",
-"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita käyttäen linkkejä",
"Allow public uploads" => "Salli julkiset lähetykset",
+"Set default expiration date" => "Aseta oletusvanhenemispäivä",
+"Expire after " => "Vanhenna",
+"days" => "päivän jälkeen",
+"Enforce expiration date" => "Pakota vanhenemispäivä",
+"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita käyttäen linkkejä",
"Allow resharing" => "Salli uudelleenjakaminen",
"Allow users to share items shared with them again" => "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita",
"Allow users to share with anyone" => "Salli käyttäjien jakaa kenen tahansa kanssa",
"Allow users to only share with users in their groups" => "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken",
"Allow mail notification" => "Salli sähköposti-ilmoitukset",
"Allow users to send mail notification for shared files" => "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista",
-"Set default expiration date" => "Aseta oletusvanhenemispäivä",
-"Expire after " => "Vanhenna",
-"days" => "päivän jälkeen",
-"Enforce expiration date" => "Pakota vanhenemispäivä",
-"Expire shares by default after N days" => "Vanhenna jaot oletuksena N päivän jälkeen",
"Security" => "Tietoturva",
"Enforce HTTPS" => "Pakota HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
@@ -170,6 +171,8 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
"Log-in password" => "Kirjautumissalasana",
"Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
+"Restore Encryption Keys" => "Palauta salausavaimet",
+"Delete Encryption Keys" => "Poista salausavaimet",
"Login Name" => "Kirjautumisnimi",
"Create" => "Luo",
"Default Storage" => "Oletustallennustila",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 6338e477de..f98dac090d 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -106,20 +106,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activer l'API de partage",
"Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
"Allow links" => "Autoriser les liens",
-"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
"Allow public uploads" => "Autoriser les téléversements publics",
-"Allow users to enable others to upload into their publicly shared folders" => "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur",
+"Set default expiration date" => "Spécifier la date d'expiration par défaut",
+"Expire after " => "Expire après",
+"days" => "jours",
+"Enforce expiration date" => "Impose la date d'expiration",
+"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
"Allow resharing" => "Autoriser le repartage",
"Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux",
"Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde",
"Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement",
"Allow mail notification" => "Autoriser les notifications par couriel",
"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés",
-"Set default expiration date" => "Spécifier la date d'expiration par défaut",
-"Expire after " => "Expire après",
-"days" => "jours",
-"Enforce expiration date" => "Impose la date d'expiration",
-"Expire shares by default after N days" => "Par défaut, les partages expireront après N jours",
"Security" => "Sécurité",
"Enforce HTTPS" => "Forcer HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 207007d56d..6c31b21eee 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Ficheiros descifrados satisfactoriamente",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
"Couldn't decrypt your files, check your password and try again" => "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
+"Encryption keys deleted permanently" => "As chaves de cifrado foron eliminadas permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
"Email saved" => "Correo gardado",
"Invalid email" => "Correo incorrecto",
"Unable to delete group" => "Non é posíbel eliminar o grupo.",
"Unable to delete user" => "Non é posíbel eliminar o usuario",
+"Backups restored successfully" => "As copias de seguranza foron restauradas satisfactoriamente",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
"Language changed" => "O idioma cambiou",
"Invalid request" => "Petición incorrecta",
"Admins can't remove themself from the admin group" => "Os administradores non poden eliminarse a si mesmos do grupo admin",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Bo contrasinal",
"Strong password" => "Contrasinal forte",
"Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
+"Delete encryptin keys permanently." => "Eliminar permanentemente as chaves de cifrado",
+"Restore encryptin keys." => "Restaurar as chaves de cifrado",
"deleted" => "eliminado",
"undo" => "desfacer",
"Unable to remove user" => "Non é posíbel retirar o usuario",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar o API para compartir",
"Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
"Allow links" => "Permitir ligazóns",
-"Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao público con ligazóns",
"Allow public uploads" => "Permitir os envíos públicos",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente",
+"Set default expiration date" => "Definir a data predeterminada de caducidade",
+"Expire after " => "Caduca após",
+"days" => "días",
+"Enforce expiration date" => "Obrigar a data de caducidade",
+"Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao público con ligazóns",
"Allow resharing" => "Permitir compartir",
"Allow users to share items shared with them again" => "Permitir que os usuarios compartan de novo os elementos compartidos con eles",
"Allow users to share with anyone" => "Permitir que os usuarios compartan con calquera",
"Allow users to only share with users in their groups" => "Permitir que os usuarios compartan só cos usuarios dos seus grupos",
"Allow mail notification" => "Permitir o envío de notificacións por correo",
"Allow users to send mail notification for shared files" => "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
-"Set default expiration date" => "Definir a data predeterminada de caducidade",
-"Expire after " => "Caduca após",
-"days" => "días",
-"Enforce expiration date" => "Obrigar a data de caducidade",
-"Expire shares by default after N days" => "As comparticións, de xeito predeterminado, caducan aos N días",
"Security" => "Seguranza",
"Enforce HTTPS" => "Forzar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
@@ -181,6 +185,9 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de cifrado non está activado, descifre todos os ficheiros",
"Log-in password" => "Contrasinal de acceso",
"Decrypt all Files" => "Descifrar todos os ficheiros",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
+"Restore Encryption Keys" => "Restaurar as chaves de cifrado",
+"Delete Encryption Keys" => "Eliminar as chaves de cifrado",
"Login Name" => "Nome de acceso",
"Create" => "Crear",
"Admin Recovery Password" => "Contrasinal de recuperación do administrador",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 928b42a201..929b9880c8 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -89,9 +89,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "A megosztás API-jának engedélyezése",
"Allow apps to use the Share API" => "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
"Allow links" => "Linkek engedélyezése",
-"Allow users to share items to the public with links" => "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat",
"Allow public uploads" => "Feltöltést engedélyezése mindenki számára",
-"Allow users to enable others to upload into their publicly shared folders" => "Engedélyezni a felhasználóknak, hogy beállíithassák, hogy mások feltölthetnek a nyilvánosan megosztott mappákba.",
+"Allow users to share items to the public with links" => "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat",
"Allow resharing" => "A továbbosztás engedélyezése",
"Allow users to share items shared with them again" => "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel",
"Allow users to share with anyone" => "A felhasználók bárkivel megoszthatják állományaikat",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 878d2d0719..a83fe3f3aa 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -85,9 +85,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktifkan API Pembagian",
"Allow apps to use the Share API" => "Izinkan aplikasi untuk menggunakan API Pembagian",
"Allow links" => "Izinkan tautan",
-"Allow users to share items to the public with links" => "Izinkan pengguna untuk berbagi item kepada publik lewat tautan",
"Allow public uploads" => "Izinkan unggahan publik",
-"Allow users to enable others to upload into their publicly shared folders" => "Izinkan pengguna memungkinkan orang lain untuk mengunggah kedalam folder berbagi publik mereka",
+"Allow users to share items to the public with links" => "Izinkan pengguna untuk berbagi item kepada publik lewat tautan",
"Allow resharing" => "Izinkan pembagian ulang",
"Allow users to share items shared with them again" => "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka.",
"Allow users to share with anyone" => "Izinkan pengguna untuk berbagi kepada siapa saja",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index e0fcb6cde6..c08a97f7cb 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "File decifrato correttamente",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
"Couldn't decrypt your files, check your password and try again" => "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
+"Encryption keys deleted permanently" => "Chiavi di cifratura eliminate definitivamente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
"Email saved" => "Email salvata",
"Invalid email" => "Email non valida",
"Unable to delete group" => "Impossibile eliminare il gruppo",
"Unable to delete user" => "Impossibile eliminare l'utente",
+"Backups restored successfully" => "Copie di sicurezza ripristinate correttamente",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
"Language changed" => "Lingua modificata",
"Invalid request" => "Richiesta non valida",
"Admins can't remove themself from the admin group" => "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Password buona",
"Strong password" => "Password forte",
"Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
+"Delete encryptin keys permanently." => "Elimina definitivamente le chiavi di cifratura.",
+"Restore encryptin keys." => "Ripristina le chiavi di cifratura.",
"deleted" => "eliminati",
"undo" => "annulla",
"Unable to remove user" => "Impossibile rimuovere l'utente",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Abilita API di condivisione",
"Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
"Allow links" => "Consenti collegamenti",
-"Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti",
"Allow public uploads" => "Consenti caricamenti pubblici",
-"Allow users to enable others to upload into their publicly shared folders" => "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise",
+"Set default expiration date" => "Imposta data di scadenza predefinita",
+"Expire after " => "Scadenza dopo",
+"days" => "giorni",
+"Enforce expiration date" => "Forza la data di scadenza",
+"Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti",
"Allow resharing" => "Consenti la ri-condivisione",
"Allow users to share items shared with them again" => "Consenti agli utenti di condividere a loro volta elementi condivisi da altri",
"Allow users to share with anyone" => "Consenti agli utenti di condividere con chiunque",
"Allow users to only share with users in their groups" => "Consenti agli utenti di condividere solo con utenti dei loro gruppi",
"Allow mail notification" => "Consenti le notifiche tramite posta elettronica",
"Allow users to send mail notification for shared files" => "Consenti agli utenti di inviare email di notifica per i file condivisi",
-"Set default expiration date" => "Imposta data di scadenza predefinita",
-"Expire after " => "Scadenza dopo",
-"days" => "giorni",
-"Enforce expiration date" => "Forza la data di scadenza",
-"Expire shares by default after N days" => "Le condivisioni scadono in modo predefinito dopo N giorni",
"Security" => "Protezione",
"Enforce HTTPS" => "Forza HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forza i client a connettersi a %s tramite una connessione cifrata.",
@@ -181,6 +185,9 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
"Log-in password" => "Password di accesso",
"Decrypt all Files" => "Decifra tutti i file",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
+"Restore Encryption Keys" => "Ripristina chiavi di cifratura",
+"Delete Encryption Keys" => "Elimina chiavi di cifratura",
"Login Name" => "Nome utente",
"Create" => "Crea",
"Admin Recovery Password" => "Password di ripristino amministrativa",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index 186be0c377..59672c742e 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "ファイルの復号化に成功しました",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "ファイルを復号化することができませんでした。owncloud のログを調査するか、管理者に連絡してください。",
"Couldn't decrypt your files, check your password and try again" => "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
+"Encryption keys deleted permanently" => "暗号化キーは完全に削除されます",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
"Email saved" => "メールアドレスを保存しました",
"Invalid email" => "無効なメールアドレス",
"Unable to delete group" => "グループを削除できません",
"Unable to delete user" => "ユーザーを削除できません",
+"Backups restored successfully" => "バックアップの復元に成功しました",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
"Language changed" => "言語が変更されました",
"Invalid request" => "不正なリクエスト",
"Admins can't remove themself from the admin group" => "管理者は自身を管理者グループから削除できません。",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "良好なパスワード",
"Strong password" => "強いパスワード",
"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
+"Delete encryptin keys permanently." => "暗号化キーを完全に削除します。",
+"Restore encryptin keys." => "暗号化キーを復元します。",
"deleted" => "削除",
"undo" => "元に戻す",
"Unable to remove user" => "ユーザーを削除できません",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "共有APIを有効にする",
"Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
"Allow links" => "リンクを許可する",
-"Allow users to share items to the public with links" => "ユーザーがリンクによりアイテムを公開することを許可する",
"Allow public uploads" => "パブリックなアップロードを許可",
-"Allow users to enable others to upload into their publicly shared folders" => "公開している共有フォルダーへのアップロードを共有しているメンバーにも許可",
+"Set default expiration date" => "有効期限の既定値を設定",
+"Expire after " => "無効になるまで",
+"days" => "日",
+"Enforce expiration date" => "有効期限を反映させる",
+"Allow users to share items to the public with links" => "ユーザーがリンクによりアイテムを公開することを許可する",
"Allow resharing" => "再共有を許可する",
"Allow users to share items shared with them again" => "ユーザーが共有しているアイテムの再共有を許可する",
"Allow users to share with anyone" => "ユーザーに誰とでも共有することを許可する",
"Allow users to only share with users in their groups" => "ユーザーにグループ内のユーザーとのみ共有を許可する",
"Allow mail notification" => "メール通知を許可",
"Allow users to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザに許可する",
-"Set default expiration date" => "有効期限の既定値を設定",
-"Expire after " => "無効になるまで",
-"days" => "日",
-"Enforce expiration date" => "有効期限を反映させる",
-"Expire shares by default after N days" => "既定値では N 日後に共有を無効にします",
"Security" => "セキュリティ",
"Enforce HTTPS" => "常にHTTPSを使用する",
"Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
@@ -181,6 +185,9 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
"Log-in password" => "ログインパスワード",
"Decrypt all Files" => "すべてのファイルを複合する",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
+"Restore Encryption Keys" => "暗号化キーを復元する",
+"Delete Encryption Keys" => "暗号化キーを削除する",
"Login Name" => "ログイン名",
"Create" => "作成",
"Admin Recovery Password" => "管理者リカバリパスワード",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index 3db4708be3..44b17e1197 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -65,8 +65,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "បើក API ចែករំលែក",
"Allow apps to use the Share API" => "អនុញ្ញាតឲ្យកម្មវិធីប្រើ API ចែករំលែក",
"Allow links" => "អនុញ្ញាតតំណ",
-"Allow users to share items to the public with links" => "អនុញ្ញាតឲ្យអ្នកប្រើចែករំលែករបស់ទៅសាធារណៈជាមួយតំណ",
"Allow public uploads" => "អនុញ្ញាតការផ្ទុកឡើងជាសាធារណៈ",
+"Allow users to share items to the public with links" => "អនុញ្ញាតឲ្យអ្នកប្រើចែករំលែករបស់ទៅសាធារណៈជាមួយតំណ",
"Allow resharing" => "អនុញ្ញាតការចែករំលែកម្ដងទៀត",
"Allow users to share with anyone" => "អនុញ្ញាតឲ្យអ្នកប្រើចែករំលែកជាមួយនរណាម្នាក់",
"Security" => "សុវត្ថិភាព",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 82c10bd430..427b59d5f7 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -91,9 +91,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "공유 API 사용하기",
"Allow apps to use the Share API" => "앱에서 공유 API를 사용할 수 있도록 허용",
"Allow links" => "링크 허용",
-"Allow users to share items to the public with links" => "사용자가 개별 항목의 링크를 공유할 수 있도록 허용",
"Allow public uploads" => "공개 업로드 허용",
-"Allow users to enable others to upload into their publicly shared folders" => "다른 사용자들이 공개된 공유 폴더에 파일 업로드 허용",
+"Allow users to share items to the public with links" => "사용자가 개별 항목의 링크를 공유할 수 있도록 허용",
"Allow resharing" => "재공유 허용",
"Allow users to share items shared with them again" => "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용",
"Allow users to share with anyone" => "누구나와 공유할 수 있도록 허용",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 2e7036aaae..3eafbea2a0 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -69,9 +69,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Įjungti Share API",
"Allow apps to use the Share API" => "Leidžia programoms naudoti Share API",
"Allow links" => "Lesti nuorodas",
-"Allow users to share items to the public with links" => "Leisti naudotojams viešai dalintis elementais su nuorodomis",
"Allow public uploads" => "Leisti viešus įkėlimus",
-"Allow users to enable others to upload into their publicly shared folders" => "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus",
+"Allow users to share items to the public with links" => "Leisti naudotojams viešai dalintis elementais su nuorodomis",
"Allow resharing" => "Leisti dalintis",
"Allow users to share items shared with them again" => "Leisti naudotojams toliau dalintis elementais pasidalintais su jais",
"Allow users to share with anyone" => "Leisti naudotojams dalintis su bet kuo",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 7d5f964a96..c0da6dad5f 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -56,9 +56,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktivēt koplietošanas API",
"Allow apps to use the Share API" => "Ļauj lietotnēm izmantot koplietošanas API",
"Allow links" => "Atļaut saites",
-"Allow users to share items to the public with links" => "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites",
"Allow public uploads" => "Atļaut publisko augšupielādi",
-"Allow users to enable others to upload into their publicly shared folders" => "Ļaut lietotājiem iespējot atļaut citiem augšupielādēt failus viņu publiskajās mapēs",
+"Allow users to share items to the public with links" => "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites",
"Allow resharing" => "Atļaut atkārtotu koplietošanu",
"Allow users to share items shared with them again" => "Ļaut lietotājiem dalīties ar vienumiem atkārtoti",
"Allow users to share with anyone" => "Ļaut lietotājiem dalīties ar visiem",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index a43bde76bc..1847d60131 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -89,9 +89,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktiver API for Deling",
"Allow apps to use the Share API" => "Tillat apps å bruke API for Deling",
"Allow links" => "Tillat lenker",
-"Allow users to share items to the public with links" => "Tillat brukere å dele filer offentlig med lenker",
"Allow public uploads" => "Tillat offentlig opplasting",
-"Allow users to enable others to upload into their publicly shared folders" => "Tillat at brukere lar andre laste opp til deres offentlig delte mapper",
+"Allow users to share items to the public with links" => "Tillat brukere å dele filer offentlig med lenker",
"Allow resharing" => "TIllat videredeling",
"Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
"Allow users to share with anyone" => "Tillat brukere å dele med alle",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 97554ed050..fa7a20b5af 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -19,10 +19,12 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Bestanden succesvol ontsleuteld",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
"Couldn't decrypt your files, check your password and try again" => "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
+"Encryption keys deleted permanently" => "Cryptosleutels permanent verwijderd",
"Email saved" => "E-mail bewaard",
"Invalid email" => "Ongeldige e-mail",
"Unable to delete group" => "Niet in staat om groep te verwijderen",
"Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
+"Backups restored successfully" => "Backup succesvol terggezet",
"Language changed" => "Taal aangepast",
"Invalid request" => "Ongeldige aanvraag",
"Admins can't remove themself from the admin group" => "Admins kunnen zichzelf niet uit de admin groep verwijderen",
@@ -56,6 +58,8 @@ $TRANSLATIONS = array(
"Good password" => "Goed wachtwoord",
"Strong password" => "Sterk wachtwoord",
"Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
+"Delete encryptin keys permanently." => "Verwijder cryptosleutels permanent.",
+"Restore encryptin keys." => "Herstel cryptosleutels.",
"deleted" => "verwijderd",
"undo" => "ongedaan maken",
"Unable to remove user" => "Kon gebruiker niet verwijderen",
@@ -106,20 +110,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activeren Share API",
"Allow apps to use the Share API" => "Apps toestaan de Share API te gebruiken",
"Allow links" => "Toestaan links",
-"Allow users to share items to the public with links" => "Toestaan dat gebruikers objecten met links delen met anderen",
"Allow public uploads" => "Sta publieke uploads toe",
-"Allow users to enable others to upload into their publicly shared folders" => "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden",
+"Set default expiration date" => "Stel standaard vervaldatum in",
+"Expire after " => "Vervalt na",
+"days" => "dagen",
+"Enforce expiration date" => "Verplicht de vervaldatum",
+"Allow users to share items to the public with links" => "Toestaan dat gebruikers objecten met links delen met anderen",
"Allow resharing" => "Toestaan opnieuw delen",
"Allow users to share items shared with them again" => "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen",
"Allow users to share with anyone" => "Toestaan dat gebruikers met iedereen delen",
"Allow users to only share with users in their groups" => "Instellen dat gebruikers alleen met leden binnen hun groepen delen",
"Allow mail notification" => "Toestaan e-mailnotificaties",
"Allow users to send mail notification for shared files" => "Sta gebruikers toe om e-mailnotificaties te versturen voor gedeelde bestanden",
-"Set default expiration date" => "Stel standaard vervaldatum in",
-"Expire after " => "Vervalt na",
-"days" => "dagen",
-"Enforce expiration date" => "Verplicht de vervaldatum",
-"Expire shares by default after N days" => "Laat shares standaard vervallen na N dagen",
"Security" => "Beveiliging",
"Enforce HTTPS" => "Afdwingen HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
@@ -181,6 +183,8 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
"Log-in password" => "Inlog-wachtwoord",
"Decrypt all Files" => "Decodeer alle bestanden",
+"Restore Encryption Keys" => "Herstel cryptosleutels",
+"Delete Encryption Keys" => "Verwijder cryptosleutels",
"Login Name" => "Inlognaam",
"Create" => "Aanmaken",
"Admin Recovery Password" => "Beheer herstel wachtwoord",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 7eacdbedfb..2fa0dc24e0 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -64,9 +64,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Slå på API-et for deling",
"Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
"Allow links" => "Tillat lenkjer",
-"Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
"Allow public uploads" => "Tillat offentlege opplastingar",
-"Allow users to enable others to upload into their publicly shared folders" => "La brukarar tillata andre å lasta opp i deira offentleg delte mapper",
+"Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
"Allow resharing" => "Tillat vidaredeling",
"Allow users to share items shared with them again" => "La brukarar vidaredela delte ting",
"Allow users to share with anyone" => "La brukarar dela med kven som helst",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index dbdc2ef999..05cb5de971 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Pliki zostały poprawnie zdeszyfrowane",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
"Couldn't decrypt your files, check your password and try again" => "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
+"Encryption keys deleted permanently" => "Klucze szyfrujące zostały trwale usunięte",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
"Email saved" => "E-mail zapisany",
"Invalid email" => "Nieprawidłowy e-mail",
"Unable to delete group" => "Nie można usunąć grupy",
"Unable to delete user" => "Nie można usunąć użytkownika",
+"Backups restored successfully" => "Archiwum zostało prawidłowo przywrócone",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
"Language changed" => "Zmieniono język",
"Invalid request" => "Nieprawidłowe żądanie",
"Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Dobre hasło",
"Strong password" => "Mocne hasło",
"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
+"Delete encryptin keys permanently." => "Usuń trwale klucze szyfrujące.",
+"Restore encryptin keys." => "Przywróć klucze szyfrujące.",
"deleted" => "usunięto",
"undo" => "cofnij",
"Unable to remove user" => "Nie można usunąć użytkownika",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Włącz API udostępniania",
"Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
"Allow links" => "Zezwalaj na odnośniki",
-"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników",
"Allow public uploads" => "Pozwól na publiczne wczytywanie",
-"Allow users to enable others to upload into their publicly shared folders" => "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów",
+"Set default expiration date" => "Ustaw domyślną datę wygaśnięcia",
+"Expire after " => "Wygaś po",
+"days" => "dniach",
+"Enforce expiration date" => "Wymuś datę wygaśnięcia",
+"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników",
"Allow resharing" => "Zezwalaj na ponowne udostępnianie",
"Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych",
"Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
"Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
"Allow mail notification" => "Pozwól na mailowe powiadomienia",
"Allow users to send mail notification for shared files" => "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
-"Set default expiration date" => "Ustaw domyślną datę wygaśnięcia",
-"Expire after " => "Wygaś po",
-"days" => "dniach",
-"Enforce expiration date" => "Wymuś datę wygaśnięcia",
-"Expire shares by default after N days" => "Wygaś udziały domyślnie po N dniach",
"Security" => "Bezpieczeństwo",
"Enforce HTTPS" => "Wymuś HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
@@ -181,6 +185,9 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
"Log-in password" => "Hasło logowania",
"Decrypt all Files" => "Odszyfruj wszystkie pliki",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
+"Restore Encryption Keys" => "Przywróć klucze szyfrujące",
+"Delete Encryption Keys" => "Usuń klucze szyfrujące",
"Login Name" => "Login",
"Create" => "Utwórz",
"Admin Recovery Password" => "Odzyskiwanie hasła administratora",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index e7534a21a7..fda73e833d 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Arquivos descriptografados com sucesso",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
"Couldn't decrypt your files, check your password and try again" => "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
+"Encryption keys deleted permanently" => "Chaves de criptografia excluídas permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
"Email saved" => "E-mail salvo",
"Invalid email" => "E-mail inválido",
"Unable to delete group" => "Não foi possível remover grupo",
"Unable to delete user" => "Não foi possível remover usuário",
+"Backups restored successfully" => "Backup restaurado com sucesso",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
"Language changed" => "Idioma alterado",
"Invalid request" => "Pedido inválido",
"Admins can't remove themself from the admin group" => "Admins não podem ser removidos do grupo admin",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Boa senha",
"Strong password" => "Senha forte",
"Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
+"Delete encryptin keys permanently." => "Eliminar chaves de criptografia permanentemente.",
+"Restore encryptin keys." => "Restaurar chaves de criptografia.",
"deleted" => "excluído",
"undo" => "desfazer",
"Unable to remove user" => "Impossível remover usuário",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Habilitar API de Compartilhamento",
"Allow apps to use the Share API" => "Permitir que aplicativos usem a API de Compartilhamento",
"Allow links" => "Permitir links",
-"Allow users to share items to the public with links" => "Permitir que usuários compartilhem itens com o público usando links",
"Allow public uploads" => "Permitir envio público",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente",
+"Set default expiration date" => "Configurar a data de expiração",
+"Expire after " => "Expirar depois de",
+"days" => "dias",
+"Enforce expiration date" => "Fazer cumprir a data de expiração",
+"Allow users to share items to the public with links" => "Permitir que usuários compartilhem itens com o público usando links",
"Allow resharing" => "Permitir recompartilhamento",
"Allow users to share items shared with them again" => "Permitir que usuários compartilhem novamente itens compartilhados com eles",
"Allow users to share with anyone" => "Permitir que usuários compartilhem com qualquer um",
"Allow users to only share with users in their groups" => "Permitir que usuários compartilhem somente com usuários em seus grupos",
"Allow mail notification" => "Permitir notificação por email",
"Allow users to send mail notification for shared files" => "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
-"Set default expiration date" => "Configurar a data de expiração",
-"Expire after " => "Expirar depois de",
-"days" => "dias",
-"Enforce expiration date" => "Fazer cumprir a data de expiração",
-"Expire shares by default after N days" => "Expirar compartilhamentos automaticamente depois de N dias",
"Security" => "Segurança",
"Enforce HTTPS" => "Forçar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
@@ -181,6 +185,9 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
"Log-in password" => "Senha de login",
"Decrypt all Files" => "Decripti todos os Arquivos",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que todos os arquivos forão descriptografados corretamente.",
+"Restore Encryption Keys" => "Restaurar Chaves de Criptografia",
+"Delete Encryption Keys" => "Eliminar Chaves de Criptografia",
"Login Name" => "Nome de Login",
"Create" => "Criar",
"Admin Recovery Password" => "Recuperação da Senha do Administrador",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 6bd466bfd6..84724e52af 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -97,16 +97,15 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar a API de partilha",
"Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha",
"Allow links" => "Permitir links",
-"Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o público utilizando um link.",
"Allow public uploads" => "Permitir Envios Públicos",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas",
+"Expire after " => "Expira após",
+"days" => "dias",
+"Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o público utilizando um link.",
"Allow resharing" => "Permitir repartilha",
"Allow users to share items shared with them again" => "Permitir que os utilizadores partilhem itens partilhados com eles",
"Allow users to share with anyone" => "Permitir que os utilizadores partilhem com todos",
"Allow users to only share with users in their groups" => "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo",
"Allow mail notification" => "Permitir notificação por email",
-"Expire after " => "Expira após",
-"days" => "dias",
"Security" => "Segurança",
"Enforce HTTPS" => "Forçar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forçar os clientes a ligar a %s através de uma ligação encriptada",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 7ada22648d..e2319623ba 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -77,9 +77,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activare API partajare",
"Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare",
"Allow links" => "Pemite legături",
-"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
"Allow public uploads" => "Permite încărcări publice",
-"Allow users to enable others to upload into their publicly shared folders" => "Permite utilizatorilor sa activeze opțiunea de încărcare a fișierelor în dosarele lor publice de către alte persoane",
+"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
"Allow resharing" => "Permite repartajarea",
"Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei",
"Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 1e780926f7..b2b7fcc3ce 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -98,9 +98,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Включить API общего доступа",
"Allow apps to use the Share API" => "Позволить приложениям использовать API общего доступа",
"Allow links" => "Разрешить ссылки",
-"Allow users to share items to the public with links" => "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой",
"Allow public uploads" => "Разрешить открытые загрузки",
-"Allow users to enable others to upload into their publicly shared folders" => "Разрешить пользователям позволять другим загружать в их открытые папки",
+"Allow users to share items to the public with links" => "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой",
"Allow resharing" => "Разрешить переоткрытие общего доступа",
"Allow users to share items shared with them again" => "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ",
"Allow users to share with anyone" => "Разрешить пользователя делать общий доступ любому",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 3468a87ae1..abd5128a0f 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -104,17 +104,16 @@ $TRANSLATIONS = array(
"Enable Share API" => "Povoliť API zdieľania",
"Allow apps to use the Share API" => "Povoliť aplikáciám používať API na zdieľanie",
"Allow links" => "Povoliť odkazy",
-"Allow users to share items to the public with links" => "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy",
"Allow public uploads" => "Povoliť verejné nahrávanie súborov",
-"Allow users to enable others to upload into their publicly shared folders" => "Povoliť používateľom umožniť iným používateľom nahrávať do ich zdieľaného priečinka",
+"Expire after " => "Platnosť",
+"days" => "dni",
+"Allow users to share items to the public with links" => "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy",
"Allow resharing" => "Povoliť zdieľanie ďalej",
"Allow users to share items shared with them again" => "Povoliť používateľom ďalej zdieľať zdieľané položky",
"Allow users to share with anyone" => "Povoliť používateľom zdieľať s kýmkoľvek",
"Allow users to only share with users in their groups" => "Povoliť používateľom zdieľať len s používateľmi v ich skupinách",
"Allow mail notification" => "Povoliť odosielať upozornenia emailom",
"Allow users to send mail notification for shared files" => "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
-"Expire after " => "Platnosť",
-"days" => "dni",
"Security" => "Zabezpečenie",
"Enforce HTTPS" => "Vynútiť HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index c633d47268..729b44c02a 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -105,9 +105,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Omogoči API souporabe",
"Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
"Allow links" => "Dovoli povezave",
-"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo predmetov z javnimi povezavami",
"Allow public uploads" => "Dovoli javno pošiljanje datotek v oblak",
-"Allow users to enable others to upload into their publicly shared folders" => "Dovoli uporabnikom, da omogočijo drugim uporabnikom, pošiljati datoteke v javno mapo.",
+"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo predmetov z javnimi povezavami",
"Allow resharing" => "Dovoli nadaljnjo souporabo",
"Allow users to share items shared with them again" => "Uporabnikom dovoli nadaljnjo souporabo predmetov",
"Allow users to share with anyone" => "Uporabnikom dovoli souporabo s komerkoli",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 29925683c0..66ccf5b62b 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -49,9 +49,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktivizo API për ndarjet",
"Allow apps to use the Share API" => "Lejoni aplikacionet të përdorin share API",
"Allow links" => "Lejo lidhjet",
-"Allow users to share items to the public with links" => "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve",
"Allow public uploads" => "Lejo ngarkimin publik",
-"Allow users to enable others to upload into their publicly shared folders" => "Lejo përdoruesit të mundësojnë të tjerët që të ngarkojnë materiale në dosjen e tyre publike",
+"Allow users to share items to the public with links" => "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve",
"Allow resharing" => "Lejo ri-ndarjen",
"Allow users to share items shared with them again" => "Lejoni përdoruesit të ndjanë dhe ata elementë të ndarë më parë ngë të tjerë",
"Allow users to share with anyone" => "Lejo përdoruesit të ndajnë me cilindo",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index f76eed303b..71dc231f1d 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -106,18 +106,16 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktivera delat API",
"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
"Allow links" => "Tillåt länkar",
-"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
"Allow public uploads" => "Tillåt offentlig uppladdning",
-"Allow users to enable others to upload into their publicly shared folders" => "Tillåt användare att aktivera\nTillåt användare att göra det möjligt för andra att ladda upp till sina offentligt delade mappar",
+"Expire after " => "Förfaller efter",
+"days" => "dagar",
+"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
"Allow resharing" => "Tillåt vidaredelning",
"Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dem",
"Allow users to share with anyone" => "Tillåt delning med alla",
"Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
"Allow mail notification" => "Tillåt e-post notifikation",
"Allow users to send mail notification for shared files" => "Tillåt användare att skicka mailnotifieringar för delade filer",
-"Expire after " => "Förfaller efter",
-"days" => "dagar",
-"Expire shares by default after N days" => "Låt delningar förfalla som standard efter N dagar",
"Security" => "Säkerhet",
"Enforce HTTPS" => "Kräv HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 4a49dc0bc5..34a1bf1d80 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Dosya şifresi başarıyla çözüldü",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dosyalarınızın şifresi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin.",
"Couldn't decrypt your files, check your password and try again" => "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin.",
+"Encryption keys deleted permanently" => "Şifreleme anahtarları kalıcı olarak silindi",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
"Email saved" => "E-posta kaydedildi",
"Invalid email" => "Geçersiz e-posta",
"Unable to delete group" => "Grup silinemiyor",
"Unable to delete user" => "Kullanıcı silinemiyor",
+"Backups restored successfully" => "Yedekler başarıyla geri yüklendi",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
"Language changed" => "Dil değiştirildi",
"Invalid request" => "Geçersiz istek",
"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini admin grubundan kaldıramaz",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "İyi parola",
"Strong password" => "Güçlü parola",
"Decrypting files... Please wait, this can take some time." => "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir.",
+"Delete encryptin keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.",
+"Restore encryptin keys." => "Şifreleme anahtarlarını geri yükle.",
"deleted" => "silinen:",
"undo" => "geri al",
"Unable to remove user" => "Kullanıcı kaldırılamıyor",
@@ -106,20 +112,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Paylaşım API'sini etkinleştir",
"Allow apps to use the Share API" => "Uygulamaların paylaşım API'sini kullanmasına izin ver",
"Allow links" => "Bağlantılara izin ver",
-"Allow users to share items to the public with links" => "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver",
"Allow public uploads" => "Herkes tarafından yüklemeye izin ver",
-"Allow users to enable others to upload into their publicly shared folders" => "Kullanıcıların, herkese açık dizinlerine, başkalarının dosya yüklemelerini etkinleştirmelerine izin ver",
+"Set default expiration date" => "Öntanımlı son kullanma tarihini ayarla",
+"Expire after " => "Şu süreden sonra süresi dolsun",
+"days" => "gün",
+"Enforce expiration date" => "Son kullanma tarihini zorla",
+"Allow users to share items to the public with links" => "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver",
"Allow resharing" => "Paylaşıma izin ver",
"Allow users to share items shared with them again" => "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver",
"Allow users to share with anyone" => "Kullanıcıların her şeyi paylaşmalarına izin ver",
"Allow users to only share with users in their groups" => "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver",
"Allow mail notification" => "Posta bilgilendirmesine izin ver",
"Allow users to send mail notification for shared files" => "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver",
-"Set default expiration date" => "Öntanımlı son kullanma tarihini ayarla",
-"Expire after " => "Şu süreden sonra süresi dolsun",
-"days" => "gün",
-"Enforce expiration date" => "Son kullanma tarihini zorla",
-"Expire shares by default after N days" => "Paylaşımların süresini öntanımlı olarak N günden sonra doldur",
"Security" => "Güvenlik",
"Enforce HTTPS" => "HTTPS bağlantısına zorla",
"Forces the clients to connect to %s via an encrypted connection." => "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
@@ -153,7 +157,7 @@ $TRANSLATIONS = array(
"Forum" => "Forum",
"Bugtracker" => "Hata Takip Sistemi",
"Commercial Support" => "Ticari Destek",
-"Get the apps to sync your files" => "Dosyalarınızı eşitlemek için uygulamayı indirin",
+"Get the apps to sync your files" => "Dosyalarınızı eşitlemek için uygulamaları indirin",
"Show First Run Wizard again" => "İlk Çalıştırma Sihirbazını yeniden göster",
"You have used %s of the available %s" => "Kullandığınız: %s. Kullanılabilir alan: %s",
"Password" => "Parola",
@@ -181,6 +185,9 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, tüm dosyalarınızın şifrelemesini kaldırın",
"Log-in password" => "Oturum açma parolası",
"Decrypt all Files" => "Tüm dosyaların şifresini çöz",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın düzgün bir şekilde şifrelerinin çözüldüğünden eminseniz kalıcı olarak silin.",
+"Restore Encryption Keys" => "Şifreleme Anahtarlarını Geri Yükle",
+"Delete Encryption Keys" => "Şifreleme Anahtarlarını Sil",
"Login Name" => "Giriş Adı",
"Create" => "Oluştur",
"Admin Recovery Password" => "Yönetici Kurtarma Parolası",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index e291659d17..d2708f1341 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -106,20 +106,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "启用共享API",
"Allow apps to use the Share API" => "允许应用软件使用共享API",
"Allow links" => "允许链接",
-"Allow users to share items to the public with links" => "允许用户使用连接公开共享项目",
"Allow public uploads" => "允许公开上传",
-"Allow users to enable others to upload into their publicly shared folders" => "用户可让其他人上传到他的公开共享文件夹",
+"Set default expiration date" => "设置默认过期日期",
+"Expire after " => "过期于",
+"days" => "天",
+"Enforce expiration date" => "强制过期日期",
+"Allow users to share items to the public with links" => "允许用户使用连接公开共享项目",
"Allow resharing" => "允许再次共享",
"Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享",
"Allow users to share with anyone" => "允许用户向任何人共享",
"Allow users to only share with users in their groups" => "允许用户只向同组用户共享",
"Allow mail notification" => "允许邮件通知",
"Allow users to send mail notification for shared files" => "允许用户发送共享文件的邮件通知",
-"Set default expiration date" => "设置默认过期日期",
-"Expire after " => "过期于",
-"days" => "天",
-"Enforce expiration date" => "强制过期日期",
-"Expire shares by default after N days" => "默认 N 天后共享过期",
"Security" => "安全",
"Enforce HTTPS" => "强制使用 HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接连接到%s。",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 567d6fb594..0221bf442d 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -106,9 +106,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "啟用分享 API",
"Allow apps to use the Share API" => "允許 apps 使用分享 API",
"Allow links" => "允許連結",
-"Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
"Allow public uploads" => "允許任何人上傳",
-"Allow users to enable others to upload into their publicly shared folders" => "允許使用者將他們公開分享的資料夾設定為「任何人皆可上傳」",
+"Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
"Allow resharing" => "允許轉貼分享",
"Allow users to share items shared with them again" => "允許使用者分享其他使用者分享給他的檔案",
"Allow users to share with anyone" => "允許使用者與任何人分享檔案",